Skip to content

Fix a memory leak introduced in #6418 #6778

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
merged 2 commits into from
Oct 19, 2020
Merged

Fix a memory leak introduced in #6418 #6778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ade789a
Initial commit
var-const Oct 19, 2020
1390572
changelog
var-const Oct 19, 2020
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
2 changes: 2 additions & 0 deletions Firestore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
setting. Timestamp fields that read from a `FIRDocumentSnapshot` now always
return `FIRTimestamp` objects. Use `FIRTimestamp.dateValue` to convert to
`NSDate` if required.
- [fixed] Fixed a memory leak introduced in 1.18.0 that may manifest when
serializing queries containing equality or non-equality comparisons.

# v1.19.0
- [changed] Internal improvements for future C++ and Unity support. Includes a
Expand Down
24 changes: 14 additions & 10 deletions Firestore/core/src/remote/serializer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,30 +1102,34 @@ google_firestore_v1_StructuredQuery_Filter Serializer::EncodeSingularFilter(
const FieldFilter& filter) const {
google_firestore_v1_StructuredQuery_Filter result{};

if (filter.op() == Filter::Operator::Equal ||
filter.op() == Filter::Operator::NotEqual) {
bool is_unary = (filter.op() == Filter::Operator::Equal ||
filter.op() == Filter::Operator::NotEqual) &&
(filter.value().is_nan() || filter.value().is_null());
if (is_unary) {
result.which_filter_type =
google_firestore_v1_StructuredQuery_Filter_unary_filter_tag;
result.unary_filter.which_operand_type =
google_firestore_v1_StructuredQuery_UnaryFilter_field_tag;
result.unary_filter.field.field_path = EncodeFieldPath(filter.field());

bool is_equality = filter.op() == Filter::Operator::Equal;
if (filter.value().is_nan()) {
auto op =
filter.op() == Filter::Operator::Equal
result.unary_filter.op =
is_equality
? google_firestore_v1_StructuredQuery_UnaryFilter_Operator_IS_NAN
: google_firestore_v1_StructuredQuery_UnaryFilter_Operator_IS_NOT_NAN; // NOLINT
result.unary_filter.op = op;
return result;

} else if (filter.value().is_null()) {
auto op =
filter.op() == Filter::Operator::Equal
result.unary_filter.op =
is_equality
? google_firestore_v1_StructuredQuery_UnaryFilter_Operator_IS_NULL
: google_firestore_v1_StructuredQuery_UnaryFilter_Operator_IS_NOT_NULL; // NOLINT
result.unary_filter.op = op;
return result;

} else {
HARD_FAIL("Expected a unary filter");
}

return result;
}

result.which_filter_type =
Expand Down