CDRIVER-4678 Fix $code
and $dbPointer
array parsing
#1356
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR will fix an error when parsing an array with
$code
or$dbPointer
where the implicit keys (0, 1, 2, etc.) would not get correctly set on the values when converting to BSON.Background
Previously, when parsing JSON such as
the BSON outputted would not correctly attach a key of
0
to the value of{"$code" : "A"}
. The same issue was caused when attempting to parse JSON with$dbpointer
.Fix
The
$code
and$dbPointer
handlers inbson-json.c
were the only two types that called_bson_json_buf_set
to save the value of the parent key (e.g.{"key": {"$code" : "A"}}
, where we want to save"key"
somewhere). These function calls were made by passing throughbson->key_buf.buf
asconst void *from
. However,bson->key_buf.buf
wasn't set to 0, 1, 2, etc.,bson->key
was. By passing throughbson->key
instead and still usingbson->key_buf.len
as the length, the implicit keys will get set correctly.Although mixing
key
withkey_buf
seems unorthodox, this is a practice done elsewhere in the codebase:mongo-c-driver/src/libbson/src/bson/bson-json.c
Line 1290 in ac436db
What's New
_bson_json_buf_set
by passing throughbson->key
$code
and$dbPointer
arrays with 1 and 2 elements