1 files changed, 3 insertions, 4 deletions
diff --git a/src/helpers.cpp b/src/helpers.cpp
index 7ae21c9..22be4de 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -124,7 +124,7 @@ STR2NUM_ERROR str2num(float &f, char const *s, char *&pEnd) {
   if (errno == ERANGE && l == -HUGE_VALF) {
     return UNDERFLOW;
   }
-  if (*s == '\0' || *pEnd != '\0') {
+  if (*s == '\0' || s == pEnd) {
     return INCONVERTIBLE;
   }
   f = l;
@@ -137,17 +137,16 @@ STR2NUM_ERROR str2num(float &f, char const *s) {
 }
 
 STR2NUM_ERROR str2num(double &d, char const *s, char *&pEnd) {
-  char *end;
   float l;
   errno = 0;
-  l = strtod(s, &end);
+  l = strtod(s, &pEnd);
   if (errno == ERANGE && l == HUGE_VAL) {
     return OVERFLOW;
   }
   if (errno == ERANGE && l == -HUGE_VAL) {
     return UNDERFLOW;
   }
-  if (*s == '\0' || *end != '\0') {
+  if (*s == '\0' || s == pEnd) {
     return INCONVERTIBLE;
   }
   d = l;