From a28ccd18f24b50dc62e37f1a5d8be641578343d9 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 16 10月 2015 21:04:54 +0800
Subject: [PATCH] Resolve issue with strBaseToInt64 on 32bit platforms

---
 libscpi/src/expression.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/libscpi/src/expression.c b/libscpi/src/expression.c
index 308a953..010b40b 100644
--- a/libscpi/src/expression.c
+++ b/libscpi/src/expression.c
@@ -193,7 +193,7 @@
     size_t i = 0;
     while (scpiLex_DecimalNumericProgramData(state, &param)) {
         if (i < length) {
-            SCPI_ParamToInt(context, &param, &values[i]);
+            SCPI_ParamToInt32(context, &param, &values[i]);
         }
 
         if (scpiLex_SpecificCharacter(state, &param, '!')) {
@@ -303,5 +303,11 @@
     if (res == SCPI_EXPR_ERROR) {
         SCPI_ErrorPush(context, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
     }
+    if (res == SCPI_EXPR_NO_MORE) {
+        if (!scpiLex_IsEos(&lex)) {
+            res = SCPI_EXPR_ERROR;
+            SCPI_ErrorPush(context, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+        }
+    }
     return res;
 }

--
Gitblit v1.9.1