From 1db957718408370ce6b23435ef642e6fad130ef0 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 2 Jan 2008 14:53:16 +0000 Subject: * util.c (ruby_strtoul): "0x", "+" and "-" is not a valid integer. end of integer should be just after "0", the beginning, the beginning respectively. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- util.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index 5a4330b899..18e7bacda4 100644 --- a/util.c +++ b/util.c @@ -117,6 +117,7 @@ ruby_strtoul(const char *str, char **endptr, int base) int sign = 0; size_t len; unsigned long ret; + const char *subject_found = str; if (base == 1 || 36 < base) { errno = EINVAL; @@ -136,6 +137,7 @@ ruby_strtoul(const char *str, char **endptr, int base) } if (str[0] == '0') { + subject_found = str+1; if (base == 0 || base == 16) { if (str[1] == 'x' || str[1] == 'X') { b = 16; @@ -157,8 +159,11 @@ ruby_strtoul(const char *str, char **endptr, int base) ret = scan_digits(str, b, &len, &overflow); + if (0 < len) + subject_found = str+len; + if (endptr) - *endptr = (char*)(str+len); + *endptr = (char*)subject_found; if (overflow) { errno = ERANGE; @@ -166,7 +171,7 @@ ruby_strtoul(const char *str, char **endptr, int base) } if (sign < 0) { - ret = -(long)ret; + ret = -ret; return ret; } else { -- cgit v1.2.3