CDRIVER-5834 Do not compare uninitialized bytes in _mongoc_server_description_equal (#1814)

apolukhin · eramongodb · kevinAlbs · commit 7f0f3ea359a6 · 2024-12-18T12:36:17.000-05:00
Fix possible comparison of uninitialized bytes in `bson_error_t`.

---------

Co-authored-by: Ezra Chung &lt;88335979+eramongodb@users.noreply.github.com&gt;
diff --git a/src/libmongoc/src/mongoc/mongoc-server-description.c b/src/libmongoc/src/mongoc/mongoc-server-description.c
@@ -1151,7 +1151,8 @@ _mongoc_server_description_equal (mongoc_server_description_t *sd1, mongoc_serve
       return false;
    }
 
-   if (0 != memcmp (&sd1->error, &sd2->error, sizeof (bson_error_t))) {
+   if (sd1->error.domain != sd2->error.domain || sd1->error.code != sd2->error.code ||
+       0 != strncmp (sd1->error.message, sd2->error.message, BSON_ERROR_BUFFER_SIZE)) {
       return false;
    }
 

Original file line number	Diff line number	Diff line change
`@@ -1151,7 +1151,8 @@ _mongoc_server_description_equal (mongoc_server_description_t *sd1, mongoc_serve`
`1151`	`1151`	`return false;`
`1152`	`1152`	`}`
`1153`	`1153`
`1154`		`- if (0 != memcmp (&sd1->error, &sd2->error, sizeof (bson_error_t))) {`
	`1154`	`+ if (sd1->error.domain != sd2->error.domain \|\| sd1->error.code != sd2->error.code \|\|`
	`1155`	`+ 0 != strncmp (sd1->error.message, sd2->error.message, BSON_ERROR_BUFFER_SIZE)) {`
`1155`	`1156`	`return false;`
`1156`	`1157`	`}`
`1157`	`1158`