SWIFT-595: update libmongoc to 1.16.x

This required slight modification to the sed scripts used during
the vendoring process, mostly to remove prefixes for bson or mongoc
headers.

Author: mbroadst

Sources/CLibMongoC/bson/bson-iso8601.c

@@ -328,7 +328,7 @@ _bson_iso8601_date_format (int64_t msec_since_epoch, bson_string_t *str)
 #endif
 
    if (msecs_part) {
-      bson_string_append_printf (str, "%s.%03" PRId64 "Z", buf, msecs_part);
+      bson_string_append_printf (str, "%s.%03" "lld" "Z", buf, msecs_part);
    } else {
       bson_string_append (str, buf);
       bson_string_append_c (str, 'Z');

Sources/CLibMongoC/bson/bson-string.c

@@ -19,6 +19,7 @@
 #include <stdarg.h>
 
 #include "CLibMongoC_bson-compat.h"
+#include "CLibMongoC_bson-config.h"
 #include "CLibMongoC_bson-string.h"
 #include "CLibMongoC_bson-memory.h"
 #include "CLibMongoC_bson-utf8.h"
@@ -545,8 +546,12 @@ bson_strncpy (char *dst,       /* IN */
       return;
    }
 
+/* Prefer strncpy_s for MSVC, or strlcpy, which has additional checks and only
+ * adds one trailing \0 */
 #ifdef _MSC_VER
    strncpy_s (dst, size, src, _TRUNCATE);
+#elif defined(BSON_HAVE_STRLCPY)
+   strlcpy (dst, src, size);
 #else
    strncpy (dst, src, size);
    dst[size - 1] = '\0';
@@ -707,7 +712,7 @@ bson_ascii_strtoll (const char *s, char **e, int base)
 
    c = *tok;
 
-   while (isspace (c)) {
+   while (bson_isspace (c)) {
       c = *++tok;
    }
 
@@ -806,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);
+}

Sources/CLibMongoC/bson/bson.c

@@ -340,9 +340,15 @@ _bson_append_va (bson_t *bson,              /* IN */
 
    do {
       n_pairs--;
-      memcpy (buf, data, data_len);
-      bson->len += data_len;
-      buf += data_len;
+      /* data may be NULL if data_len is 0. memcpy is not safe to call with NULL. */
+      if (BSON_LIKELY (data_len != 0 && data != NULL)) {
+         memcpy (buf, data, data_len);
+         bson->len += data_len;
+         buf += data_len;
+      } else if (BSON_UNLIKELY (data_len != 0 && data == NULL)) {
+         /* error, user appending NULL with non-zero length. */
+         return false;
+      }
 
       if (n_pairs) {
          data_len = va_arg (args, uint32_t);
@@ -816,7 +822,6 @@ bson_append_binary (bson_t *bson,           /* IN */
 
    BSON_ASSERT (bson);
    BSON_ASSERT (key);
-   BSON_ASSERT (binary);
 
    if (key_length < 0) {
       key_length = (int) strlen (key);
@@ -2580,9 +2585,9 @@ _bson_as_json_visit_int64 (const bson_iter_t *iter,
 
    if (state->mode == BSON_JSON_MODE_CANONICAL) {
       bson_string_append_printf (
-         state->str, "{ \"$numberLong\" : \"%" PRId64 "\"}", v_int64);
+         state->str, "{ \"$numberLong\" : \"%" "lld" "\"}", v_int64);
    } else {
-      bson_string_append_printf (state->str, "%" PRId64, v_int64);
+      bson_string_append_printf (state->str, "%" "lld", v_int64);
    }
 
    return false;
@@ -2760,15 +2765,15 @@ _bson_as_json_visit_date_time (const bson_iter_t *iter,
    if (state->mode == BSON_JSON_MODE_CANONICAL ||
        (state->mode == BSON_JSON_MODE_RELAXED && msec_since_epoch < 0)) {
       bson_string_append (state->str, "{ \"$date\" : { \"$numberLong\" : \"");
-      bson_string_append_printf (state->str, "%" PRId64, msec_since_epoch);
+      bson_string_append_printf (state->str, "%" "lld", msec_since_epoch);
       bson_string_append (state->str, "\" } }");
    } else if (state->mode == BSON_JSON_MODE_RELAXED) {
       bson_string_append (state->str, "{ \"$date\" : \"");
       _bson_iso8601_date_format (msec_since_epoch, state->str);
       bson_string_append (state->str, "\" }");
    } else {
       bson_string_append (state->str, "{ \"$date\" : ");
-      bson_string_append_printf (state->str, "%" PRId64, msec_since_epoch);
+      bson_string_append_printf (state->str, "%" "lld", msec_since_epoch);
       bson_string_append (state->str, " }");
    }
 

Sources/CLibMongoC/bson/jsonsl.c

@@ -284,13 +284,15 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_char_t *bytes, size_t nbytes)
         INVOKE_ERROR(HKEY_EXPECTED); \
     }
 
-#define VERIFY_SPECIAL(lit) \
-        if (CUR_CHAR != (lit)[jsn->pos - state->pos_begin]) { \
+#define VERIFY_SPECIAL(lit, lit_len) \
+        if ((jsn->pos - state->pos_begin) > lit_len \
+                || CUR_CHAR != (lit)[jsn->pos - state->pos_begin]) { \
             INVOKE_ERROR(SPECIAL_EXPECTED); \
         }
 
-#define VERIFY_SPECIAL_CI(lit) \
-        if (tolower(CUR_CHAR) != (lit)[jsn->pos - state->pos_begin]) { \
+#define VERIFY_SPECIAL_CI(lit, lit_len) \
+        if ((jsn->pos - state->pos_begin) > lit_len \
+                || tolower(CUR_CHAR) != (lit)[jsn->pos - state->pos_begin]) { \
             INVOKE_ERROR(SPECIAL_EXPECTED); \
         }
 
@@ -440,18 +442,18 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_char_t *bytes, size_t nbytes)
 
                 /* Verify TRUE, FALSE, NULL */
                 if (state->special_flags == JSONSL_SPECIALf_TRUE) {
-                    VERIFY_SPECIAL("true");
+                    VERIFY_SPECIAL("true", 4 /* strlen("true") */);
                 } else if (state->special_flags == JSONSL_SPECIALf_FALSE) {
-                    VERIFY_SPECIAL("false");
+                    VERIFY_SPECIAL("false", 5 /* strlen("false") */);
                 } else if (state->special_flags == JSONSL_SPECIALf_NULL) {
-                    VERIFY_SPECIAL("null");
+                    VERIFY_SPECIAL("null", 4 /* strlen("null") */);
 #ifdef JSONSL_PARSE_NAN
                 } else if (state->special_flags == JSONSL_SPECIALf_POS_INF) {
-                    VERIFY_SPECIAL_CI("infinity");
+                    VERIFY_SPECIAL_CI("infinity", 8 /* strlen("infinity") */);
                 } else if (state->special_flags == JSONSL_SPECIALf_NEG_INF) {
-                    VERIFY_SPECIAL_CI("-infinity");
+                    VERIFY_SPECIAL_CI("-infinity", 9 /* strlen("-infinity") */);
                 } else if (state->special_flags == JSONSL_SPECIALf_NAN) {
-                    VERIFY_SPECIAL_CI("nan");
+                    VERIFY_SPECIAL_CI("nan", 3 /* strlen("nan") */);
                 } else if (state->special_flags & JSONSL_SPECIALf_NULL ||
                            state->special_flags & JSONSL_SPECIALf_NAN) {
                    /* previous char was "n", are we parsing null or nan? */

Sources/CLibMongoC/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 (isspace (ch))
+      if (bson_isspace (ch))
          mongoc_b64rmap[i] = mongoc_b64rmap_space;
       /* Padding: stop parsing */
       else if (ch == Pad64)
@@ -307,8 +307,8 @@ static MONGOC_COMMON_ONCE_FUN (bson_b64_initialize_rmap)
 static int
 mongoc_b64_pton_do (char const *src, uint8_t *target, size_t targsize)
 {
-   int tarindex, state, ch;
-   uint8_t ofs;
+   int tarindex, state;
+   uint8_t ch, ofs;
 
    state = 0;
    tarindex = 0;
@@ -423,8 +423,8 @@ mongoc_b64_pton_do (char const *src, uint8_t *target, size_t targsize)
 static int
 mongoc_b64_pton_len (char const *src)
 {
-   int tarindex, state, ch;
-   uint8_t ofs;
+   int tarindex, state;
+   uint8_t ch, ofs;
 
    state = 0;
    tarindex = 0;

Sources/CLibMongoC/include/CLibMongoC_bson-compat.h

@@ -119,8 +119,8 @@ typedef SSIZE_T ssize_t;
 #ifndef PRIi64
 #define PRIi64 "I64i"
 #endif
-#ifndef PRId64
-#define PRId64 "I64i"
+#ifndef "lld"
+#define "lld" "I64i"
 #endif
 #ifndef PRIu64
 #define PRIu64 "I64u"

Sources/CLibMongoC/include/CLibMongoC_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

Sources/CLibMongoC/include/CLibMongoC_bson-types.h

@@ -271,6 +271,7 @@ typedef enum {
    BSON_SUBTYPE_UUID_DEPRECATED = 0x03,
    BSON_SUBTYPE_UUID = 0x04,
    BSON_SUBTYPE_MD5 = 0x05,
+   BSON_SUBTYPE_ENCRYPTED = 0x06,
    BSON_SUBTYPE_USER = 0x80,
 } bson_subtype_t;
 

Sources/CLibMongoC/include/CLibMongoC_mongoc-client-pool.h

@@ -67,6 +67,10 @@ mongoc_client_pool_set_error_api (mongoc_client_pool_t *pool, int32_t version);
 MONGOC_EXPORT (bool)
 mongoc_client_pool_set_appname (mongoc_client_pool_t *pool,
                                 const char *appname);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_enable_auto_encryption (mongoc_client_pool_t *pool,
+                                           mongoc_auto_encryption_opts_t *opts,
+                                           bson_error_t *error);
 BSON_END_DECLS
 
 

Sources/CLibMongoC/include/CLibMongoC_mongoc-client-session.h

@@ -33,6 +33,13 @@ typedef bool (*mongoc_client_session_with_transaction_cb_t) (
    bson_t **reply,
    bson_error_t *error);
 
+typedef enum {
+   MONGOC_TRANSACTION_NONE = 0,
+   MONGOC_TRANSACTION_STARTING = 1,
+   MONGOC_TRANSACTION_IN_PROGRESS = 2,
+   MONGOC_TRANSACTION_COMMITTED = 3,
+   MONGOC_TRANSACTION_ABORTED = 4,
+} mongoc_transaction_state_t;
 
 /* these options types are named "opt_t" but their functions are named with
  * "opts", for consistency with the older mongoc_ssl_opt_t */
@@ -92,6 +99,10 @@ MONGOC_EXPORT (const mongoc_transaction_opt_t *)
 mongoc_session_opts_get_default_transaction_opts (
    const mongoc_session_opt_t *opts);
 
+MONGOC_EXPORT (mongoc_transaction_opt_t *)
+mongoc_session_opts_get_transaction_opts (
+   const mongoc_client_session_t *session);
+
 MONGOC_EXPORT (mongoc_session_opt_t *)
 mongoc_session_opts_clone (const mongoc_session_opt_t *opts);
 
@@ -145,6 +156,10 @@ mongoc_client_session_start_transaction (mongoc_client_session_t *session,
 MONGOC_EXPORT (bool)
 mongoc_client_session_in_transaction (const mongoc_client_session_t *session);
 
+MONGOC_EXPORT (mongoc_transaction_state_t)
+mongoc_client_session_get_transaction_state (
+   const mongoc_client_session_t *session);
+
 MONGOC_EXPORT (bool)
 mongoc_client_session_commit_transaction (mongoc_client_session_t *session,
                                           bson_t *reply,