snprintf: bson_snprintf() terminates always with \0.

Author: chergert

src/mongoc/mongoc-client.c

@@ -1127,7 +1127,6 @@ mongoc_client_command (mongoc_client_t           *client,
    }
 
    bson_snprintf (ns, sizeof ns, "%s.$cmd", db_name);
-   ns[sizeof ns - 1] = '\0';
 
    return _mongoc_cursor_new (client, ns, flags, skip, limit, batch_size, true,
                               query, fields, read_prefs);

src/mongoc/mongoc-cluster.c

@@ -86,7 +86,6 @@
       const char *dot = strchr(name, '.'); \
       if (!dot || ((dot - name) > (sizeof outstr - 6))) { \
          bson_snprintf(outstr, sizeof outstr, "admin.$cmd"); \
-         outstr[sizeof outstr - 1] = '\0'; \
       } else { \
          memcpy(outstr, name, dot - name); \
          memcpy(outstr + (dot - name), ".$cmd", 6); \
@@ -878,7 +877,6 @@ _mongoc_cluster_run_command (mongoc_cluster_t      *cluster,
    BSON_ASSERT(command);
 
    bson_snprintf(ns, sizeof ns, "%s.$cmd", db_name);
-   ns[sizeof ns - 1] = '\0';
 
    rpc.query.msg_len = 0;
    rpc.query.request_id = ++cluster->request_id;

src/mongoc/mongoc-collection.c

@@ -84,15 +84,11 @@ _mongoc_collection_new (mongoc_client_t              *client,
       mongoc_read_prefs_copy(read_prefs) :
       mongoc_read_prefs_new(MONGOC_READ_PRIMARY);
 
-   bson_snprintf(col->ns, sizeof col->ns - 1, "%s.%s",
-            db, collection);
-   bson_snprintf(col->db, sizeof col->db - 1, "%s", db);
-   bson_snprintf(col->collection, sizeof col->collection - 1,
-            "%s", collection);
-
-   col->ns[sizeof col->ns-1] = '\0';
-   col->db[sizeof col->db-1] = '\0';
-   col->collection[sizeof col->collection-1] = '\0';
+   bson_snprintf (col->ns, sizeof col->ns - 1, "%s.%s",
+                  db, collection);
+   bson_snprintf (col->db, sizeof col->db - 1, "%s", db);
+   bson_snprintf (col->collection, sizeof col->collection - 1,
+                  "%s", collection);
 
    col->collectionlen = (uint32_t)strlen(col->collection);
    col->nslen = (uint32_t)strlen(col->ns);
@@ -714,8 +710,7 @@ _mongoc_collection_insert_bulk_raw (mongoc_collection_t          *collection,
    rpc.insert.documents = documents;
    rpc.insert.n_documents = n_documents;
 
-   bson_snprintf(ns, sizeof ns, "%s.$cmd", collection->db);
-   ns[sizeof ns - 1] = '\0';
+   bson_snprintf (ns, sizeof ns, "%s.$cmd", collection->db);
 
    if (!(hint = _mongoc_client_sendv(collection->client, &rpc, 1, 0,
                                      write_concern, NULL, error))) {

src/mongoc/mongoc-counters.c

@@ -126,13 +126,12 @@ mongoc_counters_calc_size (void)
 static void
 mongoc_counters_destroy (void)
 {
-   char name[32];
+   char name [32];
    int pid;
 
-   pid = getpid();
-   bson_snprintf(name, sizeof name, "/mongoc-%u", pid);
-   name[sizeof name - 1] = '\0';
-   shm_unlink(name);
+   pid = getpid ();
+   bson_snprintf (name, sizeof name, "/mongoc-%u", pid);
+   shm_unlink (name);
 }
 #endif
 
@@ -159,9 +158,8 @@ mongoc_counters_alloc (size_t size)
       goto use_malloc;
    }
 
-   pid = getpid();
-   bson_snprintf(name, sizeof name, "/mongoc-%u", pid);
-   name[sizeof name - 1] = '\0';
+   pid = getpid ();
+   bson_snprintf (name, sizeof name, "/mongoc-%u", pid);
 
    if (-1 == (fd = shm_open(name, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR))) {
       goto use_malloc;

src/mongoc/mongoc-database.c

@@ -571,7 +571,6 @@ mongoc_database_has_collection (mongoc_database_t *database,
    }
 
    bson_snprintf (ns, sizeof ns, "%s.%s", database->name, name);
-   ns[sizeof ns - 1] = '\0';
 
    read_prefs = mongoc_read_prefs_new (MONGOC_READ_PRIMARY);
    collection = mongoc_client_get_collection (database->client,

src/mongoc/mongoc-read-prefs.c

@@ -89,7 +89,6 @@ mongoc_read_prefs_add_tag (mongoc_read_prefs_t *read_prefs,
 
    key = bson_count_keys (&read_prefs->tags);
    bson_snprintf (str, sizeof str, "%d", key);
-   str[sizeof str - 1] = '\0';
 
    if (tag) {
       bson_append_document (&read_prefs->tags, str, -1, tag);

src/mongoc/mongoc-uri.c

@@ -71,12 +71,12 @@ mongoc_uri_append_host (mongoc_uri_t  *uri,
    link_ = bson_malloc0(sizeof *link_);
    bson_strncpy (link_->host, host, sizeof link_->host);
    if (strchr (host, ':')) {
-      bson_snprintf(link_->host_and_port, sizeof link_->host_and_port,
-                    "[%s]:%hu", host, port);
+      bson_snprintf (link_->host_and_port, sizeof link_->host_and_port,
+                     "[%s]:%hu", host, port);
       link_->family = AF_INET6;
    } else {
-      bson_snprintf(link_->host_and_port, sizeof link_->host_and_port,
-                    "%s:%hu", host, port);
+      bson_snprintf (link_->host_and_port, sizeof link_->host_and_port,
+                     "%s:%hu", host, port);
       link_->family = strstr (host, ".sock") ? AF_UNIX : AF_INET;
    }
    link_->host_and_port[sizeof link_->host_and_port - 1] = '\0';