diff options
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | ext/bigdecimal/bigdecimal.c | 4 | ||||
-rw-r--r-- | ext/dl/handle.c | 4 | ||||
-rw-r--r-- | ext/gdbm/gdbm.c | 2 | ||||
-rw-r--r-- | parse.y | 4 |
5 files changed, 19 insertions, 7 deletions
@@ -1,3 +1,15 @@ +Sat Oct 14 23:25:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * parse.y (parser_warning, parser_warn): some error message may + contain format specifiers. a patch from Akinori MUSHA <knu at + iDaemons.org>. [ruby-dev:29657] + + * ext/bigdecimal/bigdecimal.c (VpException): ditto. + + * ext/dl/handle.c (rb_dlhandle_initialize): ditto. + + * ext/gdbm/gdbm.c (rb_gdbm_fatal): ditto. + Sat Oct 14 08:24:45 2006 Akinori MUSHA <knu@iDaemons.org> * ext/digest/lib/digest/hmac: Back out the addition of digest/hmac diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 04266b1d42..f10af59f5b 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -2206,8 +2206,8 @@ VpException(unsigned short f,char *str,int always) return 0; /* 0 Means VpException() raised no exception */ raise: - if(fatal) rb_fatal(str); - else rb_raise(exc,str); + if(fatal) rb_fatal("%s", str); + else rb_raise(exc, "%s", str); return 0; } diff --git a/ext/dl/handle.c b/ext/dl/handle.c index 7a05115ec5..69d47caac0 100644 --- a/ext/dl/handle.c +++ b/ext/dl/handle.c @@ -66,12 +66,12 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self) ptr = dlopen(clib, cflag); #if defined(HAVE_DLERROR) if (!ptr && (err = dlerror())) { - rb_raise(rb_eRuntimeError, err); + rb_raise(rb_eRuntimeError, "%s", err); } #else if (!ptr) { err = dlerror(); - rb_raise(rb_eRuntimeError, err); + rb_raise(rb_eRuntimeError, "%s", err); } #endif Data_Get_Struct(self, struct dl_handle, dlhandle); diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index e49932f132..82109fda90 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -82,7 +82,7 @@ static void rb_gdbm_fatal(msg) char *msg; { - rb_raise(rb_eGDBMFatalError, msg); + rb_raise(rb_eGDBMFatalError, "%s", msg); } struct dbmdata { @@ -4559,7 +4559,7 @@ parser_warning(node, mesg) { int line = ruby_sourceline; ruby_sourceline = nd_line(node); - rb_warning(mesg); + rb_warning("%s", mesg); ruby_sourceline = line; } @@ -4570,7 +4570,7 @@ parser_warn(node, mesg) { int line = ruby_sourceline; ruby_sourceline = nd_line(node); - rb_warn(mesg); + rb_warn("%s", mesg); ruby_sourceline = line; } |