CDRIVER-3489 add bson_isspace

Author: kevinAlbs

src/common/common-b64.c

@@ -287,7 +287,7 @@ static MONGOC_COMMON_ONCE_FUN (bson_b64_initialize_rmap)
    for (i = 1; i < 256; ++i) {
       ch = (unsigned char) i;
       /* Whitespaces */
-      if (ch >= -1 && ch <= 255 && isspace (ch))
+      if (bson_isspace (ch))
          mongoc_b64rmap[i] = mongoc_b64rmap_space;
       /* Padding: stop parsing */
       else if (ch == Pad64)

src/libbson/doc/bson_isspace.rst

@@ -0,0 +1,29 @@
+:man_page: bson_isspace
+
+bson_isspace()
+==============
+
+Synopsis
+--------
+
+.. code-block:: c
+
+  bool
+  bson_isspace (int c);
+
+Parameters
+----------
+
+* ``c``: A character.
+
+Description
+-----------
+
+A safer alternative to ``isspace`` with additional bounds checking.
+
+It is equivalent to ``isspace``, excepts always returns false if ``c`` is out of the inclusive bounds [-1, 255].
+
+Returns
+-------
+
+A boolean indicating if the ``c`` is considered white-space (as determined by the ``isspace`` function).

src/libbson/doc/character_and_string_routines.rst

@@ -15,6 +15,7 @@ We provide a small number of character and string routines to substitute for tho
     :maxdepth: 1
 
     bson_ascii_strtoll
+    bson_isspace
     bson_snprintf
     bson_strcasecmp
     bson_strdup

src/libbson/src/bson/bson-string.c

@@ -712,7 +712,7 @@ bson_ascii_strtoll (const char *s, char **e, int base)
 
    c = *tok;
 
-   while (c >= -1 && c <= 255 && isspace (c)) {
+   while (bson_isspace (c)) {
       c = *++tok;
    }
 
@@ -811,3 +811,10 @@ bson_strcasecmp (const char *s1, const char *s2)
    return strcasecmp (s1, s2);
 #endif
 }
+
+
+bool
+bson_isspace (int c)
+{
+   return c >= -1 && c <= 255 && isspace (c);
+}

src/libbson/src/bson/bson-string.h

@@ -76,6 +76,8 @@ BSON_EXPORT (int64_t)
 bson_ascii_strtoll (const char *str, char **endptr, int base);
 BSON_EXPORT (int)
 bson_strcasecmp (const char *s1, const char *s2);
+BSON_EXPORT (bool)
+bson_isspace (int c);
 
 
 BSON_END_DECLS

src/libmongoc/tests/TestSuite.h

@@ -348,13 +348,13 @@ test_error (const char *format, ...) BSON_GNUC_PRINTF (1, 2);
       char *__bb = bson_malloc0 (strlen (__b) + 1);            \
       char *f = __a;                                           \
       do {                                                     \
-         while (*__a >= -1 &&*__a <= 255 && isspace (*__a))    \
+         while (bson_isspace (*__a))                           \
             __a++;                                             \
          __aa[i++] = *__a++;                                   \
       } while (*__a);                                          \
       i = 0;                                                   \
       do {                                                     \
-         while (*__b >= -1 &&*__b <= 255 && isspace (*__b))    \
+         while (bson_isspace (*__b))                           \
             __b++;                                             \
          __bb[i++] = *__b++;                                   \
       } while (*__b);                                          \