Merge pull request #49 from ullbergm/Error-Checking-strtof

Handle strtof parsing errors
eamars · May 22, 2024 · 53cae0a · 53cae0a
2 parents 66b90af + 25559f9
commit 53cae0a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/and_scale.c b/src/and_scale.c
@@ -43,7 +43,13 @@ static float _decode_measurement_msg(scale_standard_data_format_t * msg) {
     // Doesn't really matter though..
 
     // Decode weight information
-    float weight = strtof(msg->data, NULL);
+    char *endptr;
+    float weight = strtof(msg->data, &endptr);
+
+    if( endptr == msg->data ) {
+        // Conversion failed
+        return nanf(msg->data);
+    }
 
     return weight;
 }

diff --git a/src/gng_scale.c b/src/gng_scale.c
@@ -56,7 +56,13 @@ static float _decode_measurement_msg(gngscale_standard_data_format_t * msg) {
     }
 
     // Decode weight information
-    float weight = strtof(msg->data, NULL);
+    char *endptr;
+    float weight = strtof(msg->data, &endptr);
+
+    if( endptr == msg->data ) {
+        // Conversion failed
+        return nanf(msg->data);
+    }
 
     // Apply the sign
     weight *= sign;

diff --git a/src/steinberg_scale.c b/src/steinberg_scale.c
@@ -43,7 +43,14 @@ scale_handle_t steinberg_scale_handle = {
 
 
 static float _decode_measurement_msg(steinberg_sbs_data_format_t * msg) {
-    float weight = strtof(msg->data, NULL);
+    // Decode weight information
+    char *endptr;
+    float weight = strtof(msg->data, &endptr);
+
+    if( endptr == msg->data ) {
+        // Conversion failed
+        return nanf(msg->data);
+    }
 
     return weight;
 }