summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-20 14:11:16 +0000
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-20 14:11:16 +0000
commitd9dd52acbf99968010f7d5db3d7b4a0e9c30047b (patch)
tree5d9e8706780525bf76e29c19c2ab9f9c51bccdf7
parent7adef00759f3815cfe2509b5dac74e525079a145 (diff)
* ext/date/date_strftime.c: checks duplicated modifiers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/date/date_strftime.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fb1fd49ce5..51ec41f603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 20 23:09:34 2011 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * ext/date/date_strftime.c: checks duplicated modifiers.
+
Sun Mar 20 22:32:30 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_strftime.c: removed unused code and arguments.
diff --git a/ext/date/date_strftime.c b/ext/date/date_strftime.c
index 06ca9b0aff..3ac20c87f5 100644
--- a/ext/date/date_strftime.c
+++ b/ext/date/date_strftime.c
@@ -663,10 +663,12 @@ date_strftime_wo_timespec(char *s, size_t maxsize, const char *format,
case 'E':
/* POSIX locale extensions, ignored for now */
+ SKIP_MODIFIER_EO;
flags |= BIT_OF(LOCALE_E);
goto again;
case 'O':
/* POSIX locale extensions, ignored for now */
+ SKIP_MODIFIER_EO;
flags |= BIT_OF(LOCALE_O);
goto again;