summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-04-09 15:27:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-04-09 15:27:39 +0000
commit2e10fa962f8b7e93e1e208e22de75820732271c7 (patch)
tree3a1bc35eabb3fd0c34e91afbf66f153aa3eba041 /time.c
parent8e09f5b907868d3524e3e0557ca7bdf7cd2d73c8 (diff)
* time.c (time_strftime): RSTRING(format)->ptr might become NULL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/time.c b/time.c
index f956d31..149f8ec 100644
--- a/time.c
+++ b/time.c
@@ -1279,7 +1279,7 @@ time_strftime(time, format)
if (len == 0) {
rb_warning("strftime called with empty format string");
}
- if (strlen(fmt) < len) {
+ else if (strlen(fmt) < len) {
/* Ruby string may contain \0's. */
char *p = fmt, *pe = fmt + len;
@@ -1297,7 +1297,9 @@ time_strftime(time, format)
}
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);
if (buf != buffer) free(buf);
return str;