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

Commit 49110cb0 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

PDL: Use fixed portion of dynamic sizes for arrays am: b1a0c852 am: 44faa438 

am: fdd1024f

Change-Id: I2f0e5e3f896ce24ee2254cd9be80435b499b8ec4
parents 97509df4 fdd1024f

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

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ std::string ArrayField::GetDataType() const { 
void ArrayField::GenExtractor(std::ostream& s, int num_leading_bits, bool for_struct) const {

  s << GetDataType() << "::iterator ret_it = " << GetName() << "_ptr->begin();";

  s << "auto " << element_field_->GetName() << "_it = " << GetName() << "_it;";

  if (!element_size_.empty() && !element_size_.has_dynamic()) {

  if (!element_size_.empty()) {

    s << "while (" << element_field_->GetName() << "_it.NumBytesRemaining() >= " << element_size_.bytes();

    s << " && ret_it < " << GetName() << "_ptr->end()) {";

  } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void VectorField::GenExtractor(std::ostream& s, int num_leading_bits, bool for_s 
  if (size_field_ != nullptr && size_field_->GetFieldType() == CountField::kFieldType) {

    s << "(" << element_field_->GetName() << "_count-- > 0) && ";

  }

  if (!element_size_.empty() && !element_size_.has_dynamic()) {

  if (!element_size_.empty()) {

    s << element_field_->GetName() << "_it.NumBytesRemaining() >= " << element_size_.bytes() << ") {";

  } else {

    s << element_field_->GetName() << "_it.NumBytesRemaining() > 0) {";