Skip to content

Fix oneof handling in SubsetMiniTable to preserve roundtrip equivalence during conversion fuzz testing. #29497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix oneof handling in SubsetMiniTable to preserve roundtrip equivalence during conversion fuzz testing. #29497

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion upb/message/convert_fuzz_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ const upb_MiniTable* SubsetMiniTable(const upb_MiniTable* src, uint64_t mask,
int field_count = upb_MiniTable_FieldCount(src);
for (int i = 0; i < field_count; ++i) {
const upb_MiniTableField* f = upb_MiniTable_GetFieldByIndex(src, i);
if (mask & (1ULL << (i % 64))) {
// If the field belongs to a oneof, select/drop the oneof as a whole unit
// to preserve roundtrip equivalence. Splitting individual fields within the
// same oneof between known and unknown fields can invert wire serialization
// order when multiple oneof fields are present in the wire payload.
int mask_bit = (f->presence < 0) ? (32 + (~f->presence)) : (i % 32);
if (mask & (1ULL << (mask_bit % 64))) {
upb_MiniTableField new_f = *f;
if (f->UPB_PRIVATE(submsg_ofs) != kUpb_NoSub) {
new_subs.push_back(
Expand Down Expand Up @@ -615,6 +620,12 @@ TEST(ConvertFuzz, ArbitraryMiniTableConvertFuzzRegression_b529945368) {
20),
372456973, 1140553636);
}

TEST(ConvertFuzz, ConvertFuzzRegression_b553987075) {
ConvertFuzz(upb::fuzz::MiniTableFuzzInput{{"$::1/1*^(|%"}, {}, "", {}},
13624504597643522060ULL, 16497767249782210611ULL, " 00",
3016566825, 2825661372);
}
} // namespace

} // namespace upb
Loading