From 43e55c6bc4ef107d1be548ed24a2772f96d36987 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 20 Nov 2007 12:50:29 +0000 Subject: * time.c (time_mload): ignore invalid digits in submicro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- time.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'time.c') diff --git a/time.c b/time.c index 53081cdf38..c4dec2f812 100644 --- a/time.c +++ b/time.c @@ -2244,9 +2244,6 @@ time_mload(VALUE time, VALUE str) nsec = usec * 1000; } else { - unsigned char *ptr; - long len; - p &= ~(1UL<<31); gmt = (p >> 30) & 0x1; tm.tm_year = (p >> 14) & 0xffff; @@ -2262,15 +2259,22 @@ time_mload(VALUE time, VALUE str) nsec = usec * 1000; if (submicro != Qnil) { + unsigned char *ptr; + long len; + int digit; ptr = (unsigned char*)StringValuePtr(submicro); len = RSTRING_LEN(submicro); if (0 < len) { - nsec += (ptr[0] >> 4) * 100; - nsec += (ptr[0] & 0xf) * 10; + if (10 <= (digit = ptr[0] >> 4)) goto end_submicro; + nsec += digit * 100; + if (10 <= (digit = ptr[0] & 0xf)) goto end_submicro; + nsec += digit * 10; } if (1 < len) { - nsec += (ptr[1] >> 4); + if (10 <= (digit = ptr[1] >> 4)) goto end_submicro; + nsec += digit; } +end_submicro: ; } } time_overflow_p(&sec, &nsec); -- cgit v1.2.3