lib/util: Input validation in str_to_uint

[sliver-openvswitch.git] / lib / util.c

diff --git a/lib/util.c b/lib/util.c
index 805f33a..1ebe22a 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -613,6 +613,20 @@ str_to_llong(const char *s, int base, long long *x)
     }
 }
 
+bool
+str_to_uint(const char *s, int base, unsigned int *u)
+{
+    long long ll;
+    bool ok = str_to_llong(s, base, &ll);
+    if (!ok || ll < 0 || ll > UINT_MAX) {
+       *u = 0;
+       return false;
+    } else {
+       *u = ll;
+       return true;
+    }
+}
+
 /* Converts floating-point string 's' into a double.  If successful, stores
  * the double in '*d' and returns true; on failure, stores 0 in '*d' and
  * returns false.
@@ -1727,15 +1741,16 @@ exit:
     return ok;
 }
 
-unsigned int
+void
 xsleep(unsigned int seconds)
 {
-    unsigned int t;
-
     ovsrcu_quiesce_start();
-    t = sleep(seconds);
+#ifdef _WIN32
+    Sleep(seconds * 1000);
+#else
+    sleep(seconds);
+#endif
     ovsrcu_quiesce_end();
-    return t;
 }
 
 #ifdef _WIN32