From 6c61288b9c5b3c967937d9ab12113bc7e368e433 Mon Sep 17 00:00:00 2001
From: "hp.com!davidm" <hp.com!davidm>
Date: Tue, 29 Jun 2004 05:59:35 +0000
Subject: [PATCH] (scan_dec): Don't skip over a character unless it's really a
 digit. (scan_char): Don't skip over NUL terminator.

(Logical change 1.238)
---
 src/os-linux.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/os-linux.h b/src/os-linux.h
index 7e11dae5..b0e58667 100644
--- a/src/os-linux.h
+++ b/src/os-linux.h
@@ -139,9 +139,12 @@ scan_dec (char *cp, unsigned long *valp)
 
   while (1)
     {
-      digit = *cp++;
+      digit = *cp;
       if ((digit - '0') <= 9)
-	digit -= '0';
+	{
+	  digit -= '0';
+	  ++cp;
+	}
       else
 	break;
       val = (10 * val) + digit;
@@ -159,7 +162,11 @@ scan_char (char *cp, char *valp)
   if (!cp)
     return NULL;
 
-  *valp = *cp++;
+  *valp = *cp;
+
+  /* don't step over NUL terminator */
+  if (*cp)
+    ++cp;
   return cp;
 }