[iioadaptor] Improve strtol error handling. Contributes to MER#2076

sailfishos · Jan 23, 2020 · 7074a07 · 7074a07
1 parent b49a908
commit 7074a07
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/adaptors/iioadaptor/iioadaptor.cpp b/adaptors/iioadaptor/iioadaptor.cpp
@@ -434,10 +434,15 @@ void IioAdaptor::processSample(int fileId, int fd)
             sensordLogW() << "read():" << strerror(errno);
             return;
         }
-        result = strtol(buf, NULL, 10);
 
-        if (result == 0)
+        errno = 0; // reset errno before call
+        result = strtol(buf, NULL, 10);
+
+        // If any conversion error occurs, abort
+        if (errno != 0) {
+            sensordLogW() << "strtol(): Unable to convert string to long"; 
             return;
+        }
 
         switch(channel) {
         case 0: {