gmc-mh-1x-2x: fix potential memory leak

[libsigrok.git] / src / strutil.c

diff --git a/src/strutil.c b/src/strutil.c
index 68a9004e609339de53560dc7fb29c0605e51c465..30e992b815468e5a86c1210652b3a19aece2720b 100644 (file)
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -168,6 +169,38 @@ SR_PRIV int sr_atof(const char *str, float *ret)
        return SR_OK;
 }
 
+/**
+ * @private
+ *
+ * Convert a string representation of a numeric value to a double. The
+ * conversion is strict and will fail if the complete string does not represent
+ * a valid double. The function sets errno according to the details of the
+ * failure. This version ignores the locale.
+ *
+ * @param str The string representation to convert.
+ * @param ret Pointer to double where the result of the conversion will be stored.
+ *
+ * @retval SR_OK Conversion successful.
+ * @retval SR_ERR Failure.
+ */
+SR_PRIV int sr_atod_ascii(const char *str, double *ret)
+{
+       double tmp;
+       char *endptr = NULL;
+
+       errno = 0;
+       tmp = g_ascii_strtod(str, &endptr);
+
+       if (!endptr || *endptr || errno) {
+               if (!errno)
+                       errno = EINVAL;
+               return SR_ERR;
+       }
+
+       *ret = tmp;
+       return SR_OK;
+}
+
 /**
  * @private
  *
@@ -233,7 +266,7 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret)
        int64_t denominator = 1;
        int32_t fractional_len = 0;
        int32_t exponent = 0;
-       int is_negative = 0;
+       bool is_negative = false;
 
        errno = 0;
        integral = g_ascii_strtoll(str, &endptr, 10);
@@ -244,7 +277,7 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret)
                return SR_ERR;
 
        if (integral < 0 || str[0] == '-')
-               is_negative = 1;
+               is_negative = true;
 
        if (*endptr == '.') {
                const char* start = endptr + 1;