nagachika	2014-01-12 22:18:29 +0900 (Sun, 12 Jan 2014)

  New Revision: 44575

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44575

  Log:
    merge revision(s) 44570:
    
    tcltklib.c: create_ip_exc format argument
    
    * ext/tk/tcltklib.c (create_ip_exc): format argument must not be a
      dynamic string, not to contain unescaped %.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ext/tk/tcltklib.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ext/tk/tcltklib.c
===================================================================
--- ruby_2_0_0/ext/tk/tcltklib.c	(revision 44574)
+++ ruby_2_0_0/ext/tk/tcltklib.c	(revision 44575)
@@ -6651,7 +6651,7 @@ ip_make_safe_core(interp, argc, argv) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/tcltklib.c#L6651
     if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) {
         /* return rb_exc_new2(rb_eRuntimeError,
                               Tcl_GetStringResult(ptr->ip)); */
-        return create_ip_exc(interp, rb_eRuntimeError,
+        return create_ip_exc(interp, rb_eRuntimeError, "%s",
                              Tcl_GetStringResult(ptr->ip));
     }
 
@@ -9343,7 +9343,7 @@ ip_get_variable2_core(interp, argc, argv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/tcltklib.c#L9343
             volatile VALUE exc;
             /* exc = rb_exc_new2(rb_eRuntimeError,
                                  Tcl_GetStringResult(ptr->ip)); */
-            exc = create_ip_exc(interp, rb_eRuntimeError,
+            exc = create_ip_exc(interp, rb_eRuntimeError, "%s",
                                 Tcl_GetStringResult(ptr->ip));
             /* Tcl_Release(ptr->ip); */
             rbtk_release_ip(ptr);
@@ -9482,7 +9482,7 @@ ip_set_variable2_core(interp, argc, argv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/tcltklib.c#L9482
             volatile VALUE exc;
             /* exc = rb_exc_new2(rb_eRuntimeError,
                                  Tcl_GetStringResult(ptr->ip)); */
-            exc = create_ip_exc(interp, rb_eRuntimeError,
+            exc = create_ip_exc(interp, rb_eRuntimeError, "%s",
                                 Tcl_GetStringResult(ptr->ip));
             /* Tcl_Release(ptr->ip); */
             rbtk_release_ip(ptr);
@@ -9602,7 +9602,7 @@ ip_unset_variable2_core(interp, argc, ar https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/tcltklib.c#L9602
         if (FIX2INT(flag) & TCL_LEAVE_ERR_MSG) {
             /* return rb_exc_new2(rb_eRuntimeError,
                                   Tcl_GetStringResult(ptr->ip)); */
-            return create_ip_exc(interp, rb_eRuntimeError,
+            return create_ip_exc(interp, rb_eRuntimeError, "%s",
                                  Tcl_GetStringResult(ptr->ip));
         }
         return Qfalse;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44574)
+++ ruby_2_0_0/version.h	(revision 44575)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-01-12"
-#define RUBY_PATCHLEVEL 382
+#define RUBY_PATCHLEVEL 383
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44570


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/