Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 5712241b15df9748c9114512b335e4e7611a35ba..f5a23af2aeacd50a31c906223b0355edb7379ef9 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1,9 +1,11 @@
+#include "fmacros.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
 #include <math.h>
+
 #include "util.h"
 
 /* Glob-style pattern matching. */
@@ -336,6 +338,14 @@ void test_string2ll(void) {
     strcpy(buf,"+1");
     assert(string2ll(buf,strlen(buf),&v) == 0);
 
+    /* Leading space. */
+    strcpy(buf," 1");
+    assert(string2ll(buf,strlen(buf),&v) == 0);
+
+    /* Trailing space. */
+    strcpy(buf,"1 ");
+    assert(string2ll(buf,strlen(buf),&v) == 0);
+
     /* May not start with 0. */
     strcpy(buf,"01");
     assert(string2ll(buf,strlen(buf),&v) == 0);