1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

date_parse.c: use ALLOCV

Browse Source 
* ext/date/date_parse.c (s3e, date_zone_to_diff, parse_ddd_cb):
  use ALLOCV instead of ALLOCA get rid of stack overflow.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-06-16 09:46:06 +00:00
parent d1496e8b8c
commit e4d0f54b1b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/date/date_parse.c
View File

@ -68,6 +68,7 @@ static const char *abbr_months[] = {
static void static void
s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc) s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
{ {
VALUE vbuf = 0;
VALUE c = Qnil; VALUE c = Qnil;
if (!RB_TYPE_P(m, T_STRING)) if (!RB_TYPE_P(m, T_STRING))
@ -164,10 +165,11 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
{ {
char *buf; char *buf;
buf = ALLOCA_N(char, ep - bp + 1); buf = ALLOCV_N(char, vbuf, ep - bp + 1);
memcpy(buf, bp, ep - bp); memcpy(buf, bp, ep - bp);
buf[ep - bp] = '\0'; buf[ep - bp] = '\0';
iy = cstr2num(buf); iy = cstr2num(buf);
ALLOCV_END(vbuf);
} }
set_hash("year", iy); set_hash("year", iy);
} }
@ -189,10 +191,11 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
{ {
char *buf; char *buf;
buf = ALLOCA_N(char, ep - bp + 1); buf = ALLOCV_N(char, vbuf, ep - bp + 1);
memcpy(buf, bp, ep - bp); memcpy(buf, bp, ep - bp);
buf[ep - bp] = '\0'; buf[ep - bp] = '\0';
im = cstr2num(buf); im = cstr2num(buf);
ALLOCV_END(vbuf);
} }
set_hash("mon", im); set_hash("mon", im);
} }
@ -211,10 +214,11 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
{ {
char *buf; char *buf;
buf = ALLOCA_N(char, ep - bp + 1); buf = ALLOCV_N(char, vbuf, ep - bp + 1);
memcpy(buf, bp, ep - bp); memcpy(buf, bp, ep - bp);
buf[ep - bp] = '\0'; buf[ep - bp] = '\0';
id = cstr2num(buf); id = cstr2num(buf);
ALLOCV_END(vbuf);
} }
set_hash("mday", id); set_hash("mday", id);
} }
@ -420,6 +424,7 @@ VALUE
date_zone_to_diff(VALUE str) date_zone_to_diff(VALUE str)
{ {
VALUE offset = Qnil; VALUE offset = Qnil;
VALUE vbuf = 0;
long l, i; long l, i;
char *s, *dest, *d; char *s, *dest, *d;
@ -428,7 +433,7 @@ date_zone_to_diff(VALUE str)
l = RSTRING_LEN(str); l = RSTRING_LEN(str);
s = RSTRING_PTR(str); s = RSTRING_PTR(str);
dest = d = ALLOCA_N(char, l + 1); dest = d = ALLOCV_N(char, vbuf, l + 1);
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
if (isspace((unsigned char)s[i]) || s[i] == '\0') { if (isspace((unsigned char)s[i]) || s[i] == '\0') {
@ -543,9 +548,10 @@ date_zone_to_diff(VALUE str)
goto num; goto num;
} }
if (strpbrk(RSTRING_PTR(str), ",.")) { if (strpbrk(RSTRING_PTR(str), ",.")) {
VALUE astr = 0;
char *a, *b; char *a, *b;
a = ALLOCA_N(char, RSTRING_LEN(str) + 1); a = ALLOCV_N(char, astr, RSTRING_LEN(str) + 1);
strcpy(a, RSTRING_PTR(str)); strcpy(a, RSTRING_PTR(str));
b = strpbrk(a, ",."); b = strpbrk(a, ",.");
*b = '\0'; *b = '\0';
@ -557,6 +563,7 @@ date_zone_to_diff(VALUE str)
f_expt(INT2FIX(10), f_expt(INT2FIX(10),
LONG2NUM((long)strlen(b)))), LONG2NUM((long)strlen(b)))),
INT2FIX(60)); INT2FIX(60));
ALLOCV_END(astr);
goto num; goto num;
} }
{ {
@ -605,6 +612,7 @@ date_zone_to_diff(VALUE str)
} }
RB_GC_GUARD(str); RB_GC_GUARD(str);
ok: ok:
ALLOCV_END(vbuf);
return offset; return offset;
} }
@ -1975,7 +1983,8 @@ parse_ddd_cb(VALUE m, VALUE hash)
set_hash("zone", s5); set_hash("zone", s5);
if (*cs5 == '[') { if (*cs5 == '[') {
char *buf = ALLOCA_N(char, l5 + 1); VALUE vbuf = 0;
char *buf = ALLOCV_N(char, vbuf, l5 + 1);
char *s1, *s2, *s3; char *s1, *s2, *s3;
VALUE zone; VALUE zone;
@ -1997,6 +2006,7 @@ parse_ddd_cb(VALUE m, VALUE hash)
if (isdigit((unsigned char)*s1)) if (isdigit((unsigned char)*s1))
*--s1 = '+'; *--s1 = '+';
set_hash("offset", date_zone_to_diff(rb_str_new2(s1))); set_hash("offset", date_zone_to_diff(rb_str_new2(s1)));
ALLOCV_END(vbuf);
} }
RB_GC_GUARD(s5); RB_GC_GUARD(s5);
} }