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

* ext/date/date_parse.c (date_zone_to_diff): keep a temporary string

Browse source 
stored in variable while the contents buffer is beeing used.

* ext/date/date_parse.c (date_zone_to_diff): get rid of out of bounds
  memory read.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2011-08-28 06:53:47 +00:00
parent 650c122fd7
commit 0d530b2392
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Aug 28 15:38:17 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* ext/date/date_parse.c (date_zone_to_diff): keep a temporary string
stored in variable while the contents buffer is beeing used.
* ext/date/date_parse.c (date_zone_to_diff): get rid of out of bounds
memory read. [ruby-dev:44409] [Bug #5213]
Sun Aug 28 05:29:50 2011 Ryan Davis <ryand-ruby@zenspider.com> Sun Aug 28 05:29:50 2011 Ryan Davis <ryand-ruby@zenspider.com>
* lib/minitest/*: Imported minitest 2.5.1 (r6596) * lib/minitest/*: Imported minitest 2.5.1 (r6596)

9
ext/date/date_parse.c
View file

@ -392,10 +392,10 @@ date_zone_to_diff(VALUE str)
dl = RSTRING_LEN(str) - (sizeof DST - 1); dl = RSTRING_LEN(str) - (sizeof DST - 1);
ds = RSTRING_PTR(str) + dl; ds = RSTRING_PTR(str) + dl;
if (strcmp(ss, STD) == 0) { if (sl >= 0 && strcmp(ss, STD) == 0) {
str = rb_str_new(RSTRING_PTR(str), sl); str = rb_str_new(RSTRING_PTR(str), sl);
} }
else if (strcmp(ds, DST) == 0) { else if (dl >= 0 && strcmp(ds, DST) == 0) {
str = rb_str_new(RSTRING_PTR(str), dl); str = rb_str_new(RSTRING_PTR(str), dl);
dst = 1; dst = 1;
} }
@ -409,7 +409,7 @@ date_zone_to_diff(VALUE str)
dl = RSTRING_LEN(str) - (sizeof DST - 1); dl = RSTRING_LEN(str) - (sizeof DST - 1);
ds = RSTRING_PTR(str) + dl; ds = RSTRING_PTR(str) + dl;
if (strcmp(ds, DST) == 0) { if (dl >= 0 && strcmp(ds, DST) == 0) {
str = rb_str_new(RSTRING_PTR(str), dl); str = rb_str_new(RSTRING_PTR(str), dl);
dst = 1; dst = 1;
} }
@ -441,8 +441,10 @@ date_zone_to_diff(VALUE str)
char *s, *p; char *s, *p;
VALUE sign; VALUE sign;
VALUE hour = Qnil, min = Qnil, sec = Qnil; VALUE hour = Qnil, min = Qnil, sec = Qnil;
VALUE str_orig;
s = RSTRING_PTR(str); s = RSTRING_PTR(str);
str_orig = str;
if (strncmp(s, "gmt", 3) == 0 || if (strncmp(s, "gmt", 3) == 0 ||
strncmp(s, "utc", 3) == 0) strncmp(s, "utc", 3) == 0)
@ -467,6 +469,7 @@ date_zone_to_diff(VALUE str)
} }
else else
min = rb_str_new2(s); min = rb_str_new2(s);
RB_GC_GUARD(str_orig);
goto num; goto num;
} }
if (strpbrk(RSTRING_PTR(str), ",.")) { if (strpbrk(RSTRING_PTR(str), ",.")) {