[svn] Fix strtoll("0x", ptr, 0) to set *ptr to position of 'x', not after it.

[wget] / src / cmpt.c

diff --git a/src/cmpt.c b/src/cmpt.c
index a41429512795cae0d718e57531afba98ebda8a57..03ff3ceb64d61b27e8008f170662014d942886b1 100644 (file)
--- a/src/cmpt.c
+++ b/src/cmpt.c
@@ -1348,6 +1348,13 @@ strtoll (const char *nptr, char **endptr, int base)
        {
          base = 16;
          nptr += 2;
+         /* "0x" must be followed by at least one hex char.  If not,
+            return 0 and place ENDPTR on 'x'. */
+         if (!ISXDIGIT (*nptr))
+           {
+             --nptr;
+             goto out;
+           }
        }
       else if (base == 0)
        base = 8;
@@ -1387,6 +1394,7 @@ strtoll (const char *nptr, char **endptr, int base)
          result = newresult;
        }
     }
+ out:
   if (endptr)
     *endptr = (char *) nptr;
   return result;