From 47ab39aee6330f59263b0a9b2fc36536544651fd Mon Sep 17 00:00:00 2001 From: rsgowman Date: Mon, 25 Jun 2018 10:06:35 -0400 Subject: Refactor nanopb decoding methods (#1438) Rather than decoding the type, and then the contents, decode them both at once. --- Firestore/core/src/firebase/firestore/nanopb/reader.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Firestore/core/src/firebase/firestore/nanopb/reader.cc') diff --git a/Firestore/core/src/firebase/firestore/nanopb/reader.cc b/Firestore/core/src/firebase/firestore/nanopb/reader.cc index 3b102f0..3e6d92e 100644 --- a/Firestore/core/src/firebase/firestore/nanopb/reader.cc +++ b/Firestore/core/src/firebase/firestore/nanopb/reader.cc @@ -46,6 +46,17 @@ Tag Reader::ReadTag() { return tag; } +bool Reader::RequireWireType(pb_wire_type_t wire_type, Tag tag) { + if (!status_.ok()) return false; + if (wire_type != tag.wire_type) { + set_status(Status(FirestoreErrorCode::DataLoss, + "Input proto bytes cannot be parsed (mismatch between " + "the wiretype and the field number (tag))")); + return false; + } + return true; +} + void Reader::ReadNanopbMessage(const pb_field_t fields[], void* dest_struct) { if (!status_.ok()) return; -- cgit v1.2.3