summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-04 12:14:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-04 12:14:47 +0000
commit522f83001d6f97b7e3b0c55e51789e83d7adb30d (patch)
tree018deed4b2968106270fc9c10346f42c768ee7ff
parent954d456a9621aeee7c859babfb35dadb2b28b247 (diff)
* time.c (time_strftime): include nul character. fixed: [ruby-dev:29422]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--time.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 20cf02993a..3a030d2375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 4 21:14:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * time.c (time_strftime): include nul character. fixed: [ruby-dev:29422]
+
Mon Sep 4 16:29:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi.rb (CGI::out): specify -m0 -x option for nkf.
diff --git a/time.c b/time.c
index 03d9076ce5..11443e3959 100644
--- a/time.c
+++ b/time.c
@@ -1860,7 +1860,7 @@ time_strftime(time, format)
while (p < pe) {
len = rb_strftime(&buf, p, &tobj->tm);
rb_str_cat(str, buf, len);
- p += strlen(p) + 1;
+ p += strlen(p);
if (buf != buffer) {
free(buf);
buf = buffer;