From 3fea077ebee5b34d4d9ef2d7e968606d64c1d653 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 10 Oct 2015 15:01:07 +0200
Subject: [PATCH] xpressn.c, fetchid(), #8/15 rewrite

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

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 7850752a9..2d25df921 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -722,10 +722,12 @@ fetchid(SPICE_DSTRINGPTR t, const char *s, const char *s_end)
 
         ok = alfanum(c) || c == '.';
 
-        if (ok)
-            cadd(t, upcase(c));
+        if (!ok)
+            return s - 1;
 
-    } while (ok);
+        cadd(t, upcase(c));
+
+    } while (1);
 
     return s - 1;             /* return updated s */
 }