Skip to content

Commit

Permalink
merges r20355 from trunk into ruby_1_9_1.
Browse files Browse the repository at this point in the history
* strftime.c (rb_strftime): should not swallow incomplete
  formatter, e.g. "%E".  [ruby-dev:37170] fix: #787

* strftime.c (rb_strftime): clear flags before processing unknown
  formatter, e.g. "%i".  [ruby-dev:37180]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
yugui committed Nov 30, 2008
1 parent 5898912 commit 3814096
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Tue Nov 25 15:54:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>

* strftime.c (rb_strftime): should not swallow incomplete
formatter, e.g. "%E". [ruby-dev:37170] fix: #787

* strftime.c (rb_strftime): clear flags before processing unknown
formatter, e.g. "%i". [ruby-dev:37180]

Tue Nov 25 10:35:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>

* strftime.c (rb_strftime): "%^P" should convert to upper case.
Expand Down
10 changes: 6 additions & 4 deletions strftime.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
again:
switch (*++format) {
case '\0':
*s++ = '%';
goto out;
format--;
goto unknown;

case '%':
*s++ = '%';
Expand Down Expand Up @@ -762,8 +762,11 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept

default:
unknown:
tp = sp;
i = format - sp + 1;
tp = sp;
precision = -1;
flags = 0;
padding = 0;
break;
}
if (i) {
Expand All @@ -786,7 +789,6 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
}
}
}
out:
if (s >= endp) {
goto err;
}
Expand Down

0 comments on commit 3814096

Please sign in to comment.