AUDIT: r17021 - gnucash/trunk/src/calculation - Bug#512841: Let expression parser grok nullary functions and not crash.

[Andreas Köhler]

Author: andi5
Date: 2008-03-09 16:38:42 -0400 (Sun, 09 Mar 2008)
New Revision: 17021
Trac: http://svn.gnucash.org/trac/changeset/17021

Modified:
   gnucash/trunk/src/calculation/expression_parser.c
Log:
Bug#512841: Let expression parser grok nullary functions and not crash.

BP


Modified: gnucash/trunk/src/calculation/expression_parser.c
===================================================================
--- gnucash/trunk/src/calculation/expression_parser.c	2008-03-09 20:12:28 UTC (rev 17020)
+++ gnucash/trunk/src/calculation/expression_parser.c	2008-03-09 20:38:42 UTC (rev 17021)
@@ -1167,16 +1167,18 @@
     case FN_TOKEN:
       funcArgCount = 0;
 
-      do {
-        assignment_op(pe);
-        if ( pe->error_code )
-          return;
-        funcArgCount++;
-        if (!pe->Token || pe->Token == ')') {
-          break;
-        }
-        next_token(pe);
-      } while (pe->Token != ARG_TOKEN);
+      if (pe->Token && pe->Token != ')') {
+        do {
+          assignment_op(pe);
+          if ( pe->error_code )
+            return;
+          funcArgCount++;
+          if (!pe->Token || pe->Token == ')') {
+            break;
+          }
+          next_token(pe);
+        } while (pe->Token != ARG_TOKEN);
+      }
 
       if ( pe->Token != ')' ) {
         add_token( pe, EOS );