1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* re.c (rb_reg_desc): re might be NULL.

* regerror.c (onig_error_code_to_format): message updated.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-11-18 06:51:19 +00:00
parent ad5ff1c237
commit 4ccfa1e9f8
3 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
Tue Nov 18 15:50:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_reg_desc): re might be NULL.
* regerror.c (onig_error_code_to_format): message updated.
Tue Nov 18 09:42:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser::make_switch): makes default

2
re.c
View file

@ -380,7 +380,7 @@ static VALUE
rb_reg_desc(const char *s, long len, VALUE re)
{
VALUE str = rb_str_buf_new2("/");
if (rb_enc_asciicompat(rb_enc_get(re))) {
if (re && rb_enc_asciicompat(rb_enc_get(re))) {
rb_enc_copy(str, re);
}
else {

View file

@ -51,7 +51,7 @@ onig_error_code_to_format(int code)
case ONIG_NO_SUPPORT_CONFIG:
p = "no support in this configuration"; break;
case ONIGERR_MEMORY:
p = "fail to memory allocation"; break;
p = "failed to allocate memory"; break;
case ONIGERR_MATCH_STACK_LIMIT_OVER:
p = "match-stack limit over"; break;
case ONIGERR_TYPE_BUG: