From 01b185f9795340e28b53f46a4bd8af7de6299c47 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@redpitaya.com>
Date: 周四, 08 10月 2015 03:00:34 +0800
Subject: [PATCH] integer parser: fix array length for double variables

---
 libscpi/src/parser.c |  227 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 169 insertions(+), 58 deletions(-)

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 5e475a9..ba8b74a 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -317,46 +317,6 @@
 }
 
 /**
- * Write signed 32 bit integer value to the result
- * @param context
- * @param val
- * @return
- */
-size_t SCPI_ResultInt32(scpi_t * context, int32_t val) {
-    return SCPI_ResultInt32Base(context, val, 10, TRUE);
-}
-
-/**
- * Write unsigned 32 bit integer value to the result
- * @param context
- * @param val
- * @return
- */
-size_t SCPI_ResultUInt32(scpi_t * context, uint32_t val) {
-    return SCPI_ResultInt32Base(context, val, 10, FALSE);
-}
-
-/**
- * Write signed 64 bit integer value to the result
- * @param context
- * @param val
- * @return
- */
-size_t SCPI_ResultInt64(scpi_t * context, int64_t val) {
-    return SCPI_ResultInt64Base(context, val, 10, TRUE);
-}
-
-/**
- * Write unsigned 64 bit integer value to the result
- * @param context
- * @param val
- * @return
- */
-size_t SCPI_ResultUInt64(scpi_t * context, uint64_t val) {
-    return SCPI_ResultInt64Base(context, val, 10, FALSE);
-}
-
-/**
  * Return prefix of nondecimal base
  * @param base
  * @return
@@ -378,13 +338,13 @@
  * @param sign
  * @return
  */
-size_t SCPI_ResultInt32Base(scpi_t * context, int32_t val, int8_t base, scpi_bool_t sign) {
+static size_t resultUInt32BaseSign(scpi_t * context, uint32_t val, int8_t base, scpi_bool_t sign) {
     char buffer[32+1];
     const char * basePrefix;
     size_t result = 0;
     size_t len;
 
-    len = SCPI_Int32ToStr(val, buffer, sizeof (buffer), base, sign);
+    len = UInt32ToStrBaseSign(val, buffer, sizeof (buffer), base, sign);
     basePrefix = getBasePrefix(base);
 
     result += writeDelimiter(context);
@@ -404,13 +364,13 @@
  * @param sign
  * @return
  */
-size_t SCPI_ResultInt64Base(scpi_t * context, int64_t val, int8_t base, scpi_bool_t sign) {
+static size_t resultUInt64BaseSign(scpi_t * context, uint64_t val, int8_t base, scpi_bool_t sign) {
     char buffer[64+1];
     const char * basePrefix;
     size_t result = 0;
     size_t len;
 
-    len = SCPI_Int64ToStr(val, buffer, sizeof (buffer), base, sign);
+    len = UInt64ToStrBaseSign(val, buffer, sizeof (buffer), base, sign);
     basePrefix = getBasePrefix(base);
 
     result += writeDelimiter(context);
@@ -420,6 +380,47 @@
     result += writeData(context, buffer, len);
     context->output_count++;
     return result;
+}
+
+/**
+ * Write signed 32 bit integer value to the result
+ * @param context
+ * @param val
+ * @return
+ */
+size_t SCPI_ResultInt32(scpi_t * context, int32_t val) {
+    return resultUInt32BaseSign(context, val, 10, TRUE);
+}
+
+/**
+ * Write unsigned 32 bit integer value in specific base to the result
+ * Write signed/unsigned 32 bit integer value in specific base to the result
+ * @param context
+ * @param val
+ * @return
+ */
+size_t SCPI_ResultUInt32Base(scpi_t * context, uint32_t val, int8_t base) {
+    return resultUInt32BaseSign(context, val, base, FALSE);
+}
+
+/**
+ * Write signed 64 bit integer value to the result
+ * @param context
+ * @param val
+ * @return
+ */
+size_t SCPI_ResultInt64(scpi_t * context, int64_t val) {
+    return resultUInt64BaseSign(context, val, 10, TRUE);
+}
+
+/**
+ * Write unsigned 64 bit integer value in specific base to the result
+ * @param context
+ * @param val
+ * @return
+ */
+size_t SCPI_ResultUInt64Base(scpi_t * context, uint64_t val, int8_t base) {
+    return resultUInt64BaseSign(context, val, base, FALSE);
 }
 
 /**
@@ -468,7 +469,7 @@
     char block_header[12];
     size_t header_len;
     block_header[0] = '#';
-    SCPI_Int32ToStr(len, block_header + 2, 10, 10, FALSE);
+    SCPI_UInt32ToStrBase((uint32_t) len, block_header + 2, 10, 10);
 
     header_len = strlen(block_header + 2);
     block_header[1] = (char)(header_len + '0');
@@ -487,7 +488,7 @@
  * @return
  */
 size_t SCPI_ResultBool(scpi_t * context, scpi_bool_t val) {
-    return SCPI_ResultInt32Base(context, val ? 1 : 0, 10, FALSE);
+    return resultUInt32BaseSign(context, val ? 1 : 0, 10, FALSE);
 }
 
 /* parsing parameters */
@@ -590,7 +591,7 @@
  * @param sign
  * @return TRUE if succesful
  */
-static scpi_bool_t ParamToInt32(scpi_t * context, scpi_parameter_t * parameter, int32_t * value, scpi_bool_t sign) {
+static scpi_bool_t ParamSignToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value, scpi_bool_t sign) {
 
     if (!value) {
         SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
@@ -599,17 +600,51 @@
 
     switch (parameter->type) {
         case SCPI_TOKEN_HEXNUM:
-            return strToUInt32(parameter->ptr, (uint32_t *)value, 16) > 0 ? TRUE : FALSE;
+            return strBaseToUInt32(parameter->ptr, value, 16) > 0 ? TRUE : FALSE;
         case SCPI_TOKEN_OCTNUM:
-            return strToUInt32(parameter->ptr, (uint32_t *)value, 8) > 0 ? TRUE : FALSE;
+            return strBaseToUInt32(parameter->ptr, value, 8) > 0 ? TRUE : FALSE;
         case SCPI_TOKEN_BINNUM:
-            return strToUInt32(parameter->ptr, (uint32_t *)value, 2) > 0 ? TRUE : FALSE;
+            return strBaseToUInt32(parameter->ptr, value, 2) > 0 ? TRUE : FALSE;
         case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
         case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
             if (sign) {
-                return strToInt32(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
+                return strBaseToInt32(parameter->ptr, (int32_t *)value, 10) > 0 ? TRUE : FALSE;
             } else {
-                return strToUInt32(parameter->ptr, (uint32_t *)value, 10) > 0 ? TRUE : FALSE;
+                return strBaseToUInt32(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
+            }
+        default:
+            return FALSE;
+    }
+}
+
+/**
+ * Convert parameter to signed/unsigned 64 bit integer
+ * @param context
+ * @param parameter
+ * @param value result
+ * @param sign
+ * @return TRUE if succesful
+ */
+static scpi_bool_t ParamSignToUInt64(scpi_t * context, scpi_parameter_t * parameter, uint64_t * value, scpi_bool_t sign) {
+
+    if (!value) {
+        SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
+        return FALSE;
+    }
+
+    switch (parameter->type) {
+        case SCPI_TOKEN_HEXNUM:
+            return strBaseToUInt64(parameter->ptr, value, 16) > 0 ? TRUE : FALSE;
+        case SCPI_TOKEN_OCTNUM:
+            return strBaseToUInt64(parameter->ptr, value, 8) > 0 ? TRUE : FALSE;
+        case SCPI_TOKEN_BINNUM:
+            return strBaseToUInt64(parameter->ptr, value, 2) > 0 ? TRUE : FALSE;
+        case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
+        case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
+            if (sign) {
+                return strBaseToInt64(parameter->ptr, (int64_t *)value, 10) > 0 ? TRUE : FALSE;
+            } else {
+                return strBaseToUInt64(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
             }
         default:
             return FALSE;
@@ -624,7 +659,7 @@
  * @return TRUE if succesful
  */
 scpi_bool_t SCPI_ParamToInt32(scpi_t * context, scpi_parameter_t * parameter, int32_t * value) {
-    return ParamToInt32(context, parameter, value, TRUE);
+    return ParamSignToUInt32(context, parameter, (uint32_t *)value, TRUE);
 }
 
 /**
@@ -635,7 +670,29 @@
  * @return TRUE if succesful
  */
 scpi_bool_t SCPI_ParamToUInt32(scpi_t * context,  scpi_parameter_t * parameter, uint32_t * value) {
-    return ParamToInt32(context, parameter, (int32_t *)value, FALSE);
+    return ParamSignToUInt32(context, parameter, value, FALSE);
+}
+
+/**
+ * Convert parameter to signed 64 bit integer
+ * @param context
+ * @param parameter
+ * @param value result
+ * @return TRUE if succesful
+ */
+scpi_bool_t SCPI_ParamToInt64(scpi_t * context, scpi_parameter_t * parameter, int64_t * value) {
+    return ParamSignToUInt64(context, parameter, (uint64_t *)value, TRUE);
+}
+
+/**
+ * Convert parameter to unsigned 32 bit integer
+ * @param context
+ * @param parameter
+ * @param value result
+ * @return TRUE if succesful
+ */
+scpi_bool_t SCPI_ParamToUInt64(scpi_t * context,  scpi_parameter_t * parameter, uint64_t * value) {
+    return ParamSignToUInt64(context, parameter, value, FALSE);
 }
 
 /**
@@ -711,7 +768,7 @@
  * @param sign
  * @return
  */
-static scpi_bool_t ParamInt32(scpi_t * context, int32_t * value, scpi_bool_t mandatory, scpi_bool_t sign) {
+static scpi_bool_t ParamSignUInt32(scpi_t * context, uint32_t * value, scpi_bool_t mandatory, scpi_bool_t sign) {
     scpi_bool_t result;
     scpi_parameter_t param;
 
@@ -723,7 +780,39 @@
     result = SCPI_Parameter(context, &param, mandatory);
     if (result) {
         if (SCPI_ParamIsNumber(&param, FALSE)) {
-            result = ParamToInt32(context, &param, value, sign);
+            result = ParamSignToUInt32(context, &param, value, sign);
+        } else if (SCPI_ParamIsNumber(&param, TRUE)) {
+            SCPI_ErrorPush(context, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
+            result = FALSE;
+        } else {
+            SCPI_ErrorPush(context, SCPI_ERROR_DATA_TYPE_ERROR);
+            result = FALSE;
+        }
+    }
+    return result;
+}
+
+/**
+ * Read signed/unsigned 64 bit integer parameter
+ * @param context
+ * @param value
+ * @param mandatory
+ * @param sign
+ * @return
+ */
+static scpi_bool_t ParamSignUInt64(scpi_t * context, uint64_t * value, scpi_bool_t mandatory, scpi_bool_t sign) {
+    scpi_bool_t result;
+    scpi_parameter_t param;
+
+    if (!value) {
+        SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
+        return FALSE;
+    }
+
+    result = SCPI_Parameter(context, &param, mandatory);
+    if (result) {
+        if (SCPI_ParamIsNumber(&param, FALSE)) {
+            result = ParamSignToUInt64(context, &param, value, sign);
         } else if (SCPI_ParamIsNumber(&param, TRUE)) {
             SCPI_ErrorPush(context, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
             result = FALSE;
@@ -743,7 +832,7 @@
  * @return
  */
 scpi_bool_t SCPI_ParamInt32(scpi_t * context, int32_t * value, scpi_bool_t mandatory) {
-    return ParamInt32(context, value, mandatory, TRUE);
+    return ParamSignUInt32(context, (uint32_t *)value, mandatory, TRUE);
 }
 
 /**
@@ -754,7 +843,29 @@
  * @return
  */
 scpi_bool_t SCPI_ParamUInt32(scpi_t * context, uint32_t * value, scpi_bool_t mandatory) {
-    return ParamInt32(context, (int32_t *)value, mandatory, FALSE);
+    return ParamSignUInt32(context, value, mandatory, FALSE);
+}
+
+/**
+ * Read signed 64 bit integer parameter
+ * @param context
+ * @param value
+ * @param mandatory
+ * @return
+ */
+scpi_bool_t SCPI_ParamInt64(scpi_t * context, int64_t * value, scpi_bool_t mandatory) {
+    return ParamSignUInt64(context, (uint64_t *)value, mandatory, TRUE);
+}
+
+/**
+ * Read unsigned 64 bit integer parameter
+ * @param context
+ * @param value
+ * @param mandatory
+ * @return
+ */
+scpi_bool_t SCPI_ParamUInt64(scpi_t * context, uint64_t * value, scpi_bool_t mandatory) {
+    return ParamSignUInt64(context, value, mandatory, FALSE);
 }
 
 /**

--
Gitblit v1.9.1