commit cc5d0e04ee313d0ceee5d8e4e697142eaf240dca
author Paolo Bonzini <pbonzini@redhat.com> Wed Feb 11 12:30:43 2015 +0100
committer Michael Tokarev <mjt@tls.msk.ru> Tue Mar 10 08:15:33 2015 +0300
tree 3b20300c8c787685262c9e6382e91dc72a83b817
parent 7c601803fb5f868a05ef762eebcc32bdfd1ebfdc

cutils: refine strtol error handling in parse_debug_env

Avoid truncation of a 64-bit long to a 32-bit int, and check for errno
(especially ERANGE).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

util/cutils.c

diff --git a/util/cutils.c b/util/cutils.c
index c2250d1..144b25c 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -537,16 +537,17 @@
 {
     char *debug_env = getenv(name);
     char *inv = NULL;
-    int debug;
+    long debug;
 
     if (!debug_env) {
         return initial;
     }
+    errno = 0;
     debug = strtol(debug_env, &inv, 10);
     if (inv == debug_env) {
         return initial;
     }
-    if (debug < 0 || debug > max) {
+    if (debug < 0 || debug > max || errno != 0) {
         fprintf(stderr, "warning: %s not in [0, %d]", name, max);
         return initial;
     }