archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 18:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 44570:

Browse source 
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 %.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-01-12 13:18:29 +00:00
parent 7b60ab093b
commit e76761e7f2
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/tk/tcltklib.c
View file

@ -6651,7 +6651,7 @@ ip_make_safe_core(interp, argc, argv)
if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) { if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) {
/* return rb_exc_new2(rb_eRuntimeError, /* return rb_exc_new2(rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip)); */ Tcl_GetStringResult(ptr->ip)); */
return create_ip_exc(interp, rb_eRuntimeError, return create_ip_exc(interp, rb_eRuntimeError, "%s",
Tcl_GetStringResult(ptr->ip)); Tcl_GetStringResult(ptr->ip));
} }
@ -9343,7 +9343,7 @@ ip_get_variable2_core(interp, argc, argv)
volatile VALUE exc; volatile VALUE exc;
/* exc = rb_exc_new2(rb_eRuntimeError, /* exc = rb_exc_new2(rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip)); */ Tcl_GetStringResult(ptr->ip)); */
exc = create_ip_exc(interp, rb_eRuntimeError, exc = create_ip_exc(interp, rb_eRuntimeError, "%s",
Tcl_GetStringResult(ptr->ip)); Tcl_GetStringResult(ptr->ip));
/* Tcl_Release(ptr->ip); */ /* Tcl_Release(ptr->ip); */
rbtk_release_ip(ptr); rbtk_release_ip(ptr);
@ -9482,7 +9482,7 @@ ip_set_variable2_core(interp, argc, argv)
volatile VALUE exc; volatile VALUE exc;
/* exc = rb_exc_new2(rb_eRuntimeError, /* exc = rb_exc_new2(rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip)); */ Tcl_GetStringResult(ptr->ip)); */
exc = create_ip_exc(interp, rb_eRuntimeError, exc = create_ip_exc(interp, rb_eRuntimeError, "%s",
Tcl_GetStringResult(ptr->ip)); Tcl_GetStringResult(ptr->ip));
/* Tcl_Release(ptr->ip); */ /* Tcl_Release(ptr->ip); */
rbtk_release_ip(ptr); rbtk_release_ip(ptr);
@ -9602,7 +9602,7 @@ ip_unset_variable2_core(interp, argc, argv)
if (FIX2INT(flag) & TCL_LEAVE_ERR_MSG) { if (FIX2INT(flag) & TCL_LEAVE_ERR_MSG) {
/* return rb_exc_new2(rb_eRuntimeError, /* return rb_exc_new2(rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip)); */ Tcl_GetStringResult(ptr->ip)); */
return create_ip_exc(interp, rb_eRuntimeError, return create_ip_exc(interp, rb_eRuntimeError, "%s",
Tcl_GetStringResult(ptr->ip)); Tcl_GetStringResult(ptr->ip));
} }
return Qfalse; return Qfalse;

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-01-12" #define RUBY_RELEASE_DATE "2014-01-12"
#define RUBY_PATCHLEVEL 382 #define RUBY_PATCHLEVEL 383
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1