r17129 - gnucash/branches/2.2/src/calculation - [r17021] Bug #512841: Let expression parser grok nullary functions and not crash.

[Andreas Köhler]

Author: andi5
Date: 2008-04-26 12:48:56 -0400 (Sat, 26 Apr 2008)
New Revision: 17129
Trac: http://svn.gnucash.org/trac/changeset/17129

Modified:
   gnucash/branches/2.2/src/calculation/expression_parser.c
Log:
[r17021] Bug #512841: Let expression parser grok nullary functions and not crash.


Modified: gnucash/branches/2.2/src/calculation/expression_parser.c
===================================================================
--- gnucash/branches/2.2/src/calculation/expression_parser.c	2008-04-26 16:48:48 UTC (rev 17128)
+++ gnucash/branches/2.2/src/calculation/expression_parser.c	2008-04-26 16:48:56 UTC (rev 17129)
@@ -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 );