From 446ea127c331f14701a993f404e3a930055173cf Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 25 Nov 2008 14:24:47 +0000 Subject: * 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/trunk@20355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ strftime.c | 10 ++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25191fdaca..2496c6de0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 25 15:54:07 2008 Yukihiro Matsumoto + + * 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 * strftime.c (rb_strftime): "%^P" should convert to upper case. diff --git a/strftime.c b/strftime.c index 5002c56c06..7913c792a5 100644 --- a/strftime.c +++ b/strftime.c @@ -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++ = '%'; @@ -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) { @@ -786,7 +789,6 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept } } } -out: if (s >= endp) { goto err; } -- cgit v1.2.3