Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba0d3f01 authored Mar 14, 2024 by Myles Watson Committed by Automerger Merge Worker Mar 14, 2024

Merge "PDL: Exit early when parsing counted vectors" into main am: 8cf69e75 am: f1ff65c9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3001340

Change-Id: Ic2ab1fd0e4e692d78e7bcfdf8624e4face4281fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 75b3011d f1ff65c9

system/gd/packet/parser/fields/vector_field.cc

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@ void VectorField::GenExtractor(std::ostream& s, int num_leading_bits, bool for_s
		}
		s << "while (";
		if (size_field_ != nullptr && size_field_->GetFieldType() == CountField::kFieldType) {
		s << "(" << element_field_->GetName() << "_count > 0) && ";
		s << "(" << element_field_->GetName() << "_count-- > 0) && ";
		}
		if (!element_size_.empty()) {

system/gd/packet/parser/test/test_packets.pdl

+20 −0

Original line number	Diff line number	Diff line
		@@ -135,11 +135,24 @@ packet SizedArrayEnum {
		enum_array : ForArrays[],
		}

		test SizedArrayEnum {
		"\x00\x00",
		"\x02\x00\x01\x02",
		"\x04\x00\x01\x02\x11\x12",
		"\x06\x00\x01\x02\x11\x12\x21\x22",
		}

		packet CountArrayEnum {
		_count_(enum_array) : 8,
		enum_array : ForArrays[],
		}

		test CountArrayEnum {
		"\x01\x01\x02",
		"\x02\x01\x02\x11\x12",
		"\x03\x01\x02\x11\x12\x21\x22",
		}

		packet SizedArrayCustom {
		_size_(six_bytes_array) : 8,
		an_extra_byte : 8,
		@@ -197,6 +210,13 @@ packet VectorOfStruct {
		array : TwoRelatedNumbers[],
		}

		test VectorOfStruct {
		"\x00",
		"\x01\x01\x02\x03",
		"\x02\x01\x02\x03\x11\x12\x13",
		"\x03\x01\x02\x03\x11\x12\x13\x21\x22\x23",
		}

		packet ArrayOfStruct {
		the_count : 8,
		array : TwoRelatedNumbers[4],