summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-02 14:53:16 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-02 14:53:16 +0000
commit1db957718408370ce6b23435ef642e6fad130ef0 (patch)
treef90ec4a54f6296c4319036f61277b15dbea4dcc0 /util.c
parent99fc557fa5f15b82019c866b3f55bfd8106b04af (diff)
* 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
Diffstat (limited to 'util.c')
-rw-r--r--util.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/util.c b/util.c
index 5a4330b8995..18e7bacda4a 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 {