From d38804d7c04b0384aad6b6587823d4d6bd84717b Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 14 May 2016 13:44:56 +0200
Subject: [PATCH] nupa_substitute(), move final kptr incrementation out of the
 loop

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

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index fdf1821fe..9e0eaa2f7 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1210,14 +1210,13 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
                     nnest--;
 
                 if (nnest == 0) {
-                    kptr++;
                     break;
                 }
                 if (d == '\0') {
-                    kptr++;
                     break;
                 }
             }
+            kptr++;
 
             if (d == '\0') {
                 err = message(dico, "Closing \"}\" not found.\n");
@@ -1268,14 +1267,13 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
                         level--;
 
                     if (kptr >= s_end) {
-                        kptr++;
                         break;
                     }
                     if ((d == ')') && (level <= 0)) {
-                        kptr++;
                         break;
                     }
                 }
+                kptr++;
 
                 if (kptr > s_end) {
                     err = message(dico, "Closing \")\" not found.\n");
@@ -1297,14 +1295,13 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
                         d = *kptr;
 
                     if (kptr >= s_end) {
-                        kptr++;
                         break;
                     }
                     if (d <= ' ') {
-                        kptr++;
                         break;
                     }
                 }
+                kptr++;
 
                 err = evaluate_variable(dico, &qstr, s - 1, kptr - 1);
                 s = kptr - 1;