CDRIVER-5754 always write output on error in bson_validate_with_error_and_offset (#1767)

* bson_validate_with_error_and_offset: write outputs when err_offset==0
* regression test, test_bson_validate_with_error_and_offset

---------

Co-authored-by: Kevin Albertson <[email protected]>

Author: Micah Scott @ MongoDB

src/libbson/src/bson/bson.c

@@ -3321,16 +3321,17 @@ bson_validate_with_error_and_offset (const bson_t *bson,
    state.flags = flags;
    _bson_validate_internal (bson, &state);
 
-   if (state.err_offset > 0) {
+   if (state.err_offset >= 0) {
       if (offset) {
          *offset = (size_t) state.err_offset;
       }
       if (error) {
          memcpy (error, &state.error, sizeof *error);
       }
+      return false;
    }
 
-   return state.err_offset < 0;
+   return true;
 }
 
 

src/libbson/tests/test-bson.c

@@ -1119,6 +1119,18 @@ test_bson_validate_dbpointer (void)
 }
 
 
+static void
+test_bson_validate_with_error_and_offset (void)
+{
+   size_t err_offset = 12345;
+   bson_error_t err = {67890};
+   bson_t bson = {0};
+   ASSERT (!bson_validate_with_error_and_offset (&bson, BSON_VALIDATE_NONE, &err_offset, &err));
+   ASSERT_CMPSIZE_T (err_offset, ==, 0);
+   ASSERT_CMPUINT32 (err.domain, !=, 67890); // domain is overwritten.
+}
+
+
 static void
 test_bson_validate (void)
 {
@@ -3228,6 +3240,7 @@ test_bson_install (TestSuite *suite)
    TestSuite_Add (suite, "/bson/validate/dbref", test_bson_validate_dbref);
    TestSuite_Add (suite, "/bson/validate/bool", test_bson_validate_bool);
    TestSuite_Add (suite, "/bson/validate/dbpointer", test_bson_validate_dbpointer);
+   TestSuite_Add (suite, "/bson/validate/with_error_and_offset", test_bson_validate_with_error_and_offset);
    TestSuite_Add (suite, "/bson/new_1mm", test_bson_new_1mm);
    TestSuite_Add (suite, "/bson/init_1mm", test_bson_init_1mm);
    TestSuite_Add (suite, "/bson/build_child", test_bson_build_child);