Skip to content

[Pick][0.7 to 0.8] | fix deserialize returning invalid message on failure (#1012) #1015

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

Merged
lihuiba merged 1 commit into from
Oct 14, 2025
+5 −9
Merged

[Pick][0.7 to 0.8] | fix deserialize returning invalid message on failure (#1012) #1015

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
14 changes: 5 additions & 9 deletions rpc/serialize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ namespace rpc

void process_field(buffer& x)
{
if (x.size()==0)
if (x.size() == 0)
return;
x._ptr = _iov->extract_front_continuous(x.size());
if (!x._ptr)
Expand All @@ -462,13 +462,9 @@ namespace rpc
"only Messages are permitted");

// deserialize the main body from back
_iov=iov;
auto t = iov -> extract_back<T>();
if (t) {
if (!t->validate_checksum(iov, t, sizeof(*t))) {
failed = true;
return nullptr;
}
_iov = iov;
auto t = iov->extract_back<T>();
if (t && t->validate_checksum(iov, t, sizeof(*t))) {
// deserialize aligned fields, and non-aligned fields, from front
auto aligned = FilterAlignedFields(this, true);
t->process_fields(aligned);
Expand All @@ -477,7 +473,7 @@ namespace rpc
} else {
failed = true;
}
return t;
return failed ? nullptr : t;
}
};

Expand Down
Loading