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

* time.c (time_strftime): RSTRING(format)->ptr might become NULL.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-04-09 15:27:39 +00:00
parent 8e09f5b907
commit 2e10fa962f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Apr 10 00:27:07 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* time.c (time_strftime): RSTRING(format)->ptr might become NULL.
Wed Apr 9 23:54:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Wed Apr 9 23:54:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* variable.c (rb_obj_remove_instance_variable): better message. * variable.c (rb_obj_remove_instance_variable): better message.

6
time.c
View File

@ -1279,7 +1279,7 @@ time_strftime(time, format)
if (len == 0) { if (len == 0) {
rb_warning("strftime called with empty format string"); rb_warning("strftime called with empty format string");
} }
if (strlen(fmt) < len) { else if (strlen(fmt) < len) {
/* Ruby string may contain \0's. */ /* Ruby string may contain \0's. */
char *p = fmt, *pe = fmt + len; char *p = fmt, *pe = fmt + len;
@ -1297,7 +1297,9 @@ time_strftime(time, format)
} }
return str; return str;
} }
len = rb_strftime(&buf, RSTRING(format)->ptr, &tobj->tm); else {
len = rb_strftime(&buf, RSTRING(format)->ptr, &tobj->tm);
}
str = rb_str_new(buf, len); str = rb_str_new(buf, len);
if (buf != buffer) free(buf); if (buf != buffer) free(buf);
return str; return str;