From 16b53e37845e3dd627c0d342dd9b2be3197b3afc Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 10 Oct 2015 16:33:10 +0200
Subject: [PATCH] xpressn.c, fetchid(), #9/15 reorder

---
 src/frontend/numparam/xpressn.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 2d25df921..8729cb3da 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -712,10 +712,11 @@ fetchid(SPICE_DSTRINGPTR t, const char *s, const char *s_end)
 
     do
     {
-        c = *s++;
-        if (s > s_end)
+        if (s >= s_end)
             break;
 
+        c = *s++;
+
         // facts: upcase('\0') == '\0'
         // facts: alfanum('\0') == false
         // facts: alfanum(upcase(x)) == alfanum(x)
@@ -729,7 +730,7 @@ fetchid(SPICE_DSTRINGPTR t, const char *s, const char *s_end)
 
     } while (1);
 
-    return s - 1;             /* return updated s */
+    return s;
 }