From 569fe2922fe12c25f59a21171dad0e8553f17384 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 16 Oct 2018 09:11:12 +0000 Subject: [PATCH] string.c: grapheme cluster regexp failure * string.c (get_reg_grapheme_cluster): show error info and relax to rb_fatal from rb_bug. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/string.c b/string.c index 691e99eca9..5fb2d2bdb7 100644 --- a/string.c +++ b/string.c @@ -8428,10 +8428,13 @@ get_reg_grapheme_cluster(rb_encoding *enc) } if (!reg_grapheme_cluster) { const OnigUChar source[] = "\\X"; + OnigErrorInfo einfo; int r = onig_new(®_grapheme_cluster, source, source + sizeof(source) - 1, - ONIG_OPTION_DEFAULT, enc, OnigDefaultSyntax, NULL); + ONIG_OPTION_DEFAULT, enc, OnigDefaultSyntax, &einfo); if (r) { - rb_bug("cannot compile grapheme cluster regexp"); + UChar message[ONIG_MAX_ERROR_MESSAGE_LEN]; + onig_error_code_to_str(message, r, &einfo); + rb_fatal("cannot compile grapheme cluster regexp: %s", (char *)message); } if (encidx == rb_utf8_encindex()) { reg_grapheme_cluster_utf8 = reg_grapheme_cluster;