From 1df42597d15416357a20bd68700ce1a2d245e8bb Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Mar 2011 08:44:45 +0000
Subject: cancel subversion backfire. sorry

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 strftime.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'strftime.c')

diff --git a/strftime.c b/strftime.c
index dc6df615d7..9d9f48d0de 100644
--- a/strftime.c
+++ b/strftime.c
@@ -237,6 +237,10 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, const str
 			i = rb_strftime_with_timespec(s, endp - s, (fmt), vtm, timev, ts, gmt); \
 			if (!i) return 0; \
 			if (precision > i) {\
+				if (start + maxsize < s + precision) { \
+					errno = ERANGE; \
+					return 0; \
+				} \
 				memmove(s + precision - i, s, i);\
 				memset(s, padding ? padding : ' ', precision - i); \
 				s += precision;	\
-- 
cgit v1.2.3