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

Commit 15428b17 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "RootCanal: Fix parsing of arrayed controller properties"

parents 65a46a7f 5bd7e2dc

tools/rootcanal/model/controller/controller_properties.cc

+4 −2
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ static bool ParseUintArray(Json::Value root, std::string field_name, 
  }



  for (size_t n = 0; n < N; n++) {

    unsigned long long parsed_value = std::stoull(value.asString(), nullptr, 0);

    unsigned long long parsed_value =

        std::stoull(value[static_cast<int>(n)].asString(), nullptr, 0);

    if (parsed_value > max_value) {

      LOG_INFO("invalid value for %s[%zu] is discarded: %llu > %llu",

               field_name.c_str(), n, parsed_value,
@@ -210,7 +211,8 @@ static bool ParseUintVector(Json::Value root, std::string field_name, 


  output_value.clear();

  for (size_t n = 0; n < value.size(); n++) {

    unsigned long long parsed_value = std::stoull(value.asString(), nullptr, 0);

    unsigned long long parsed_value =

        std::stoull(value[static_cast<int>(n)].asString(), nullptr, 0);

    if (parsed_value > max_value) {

      LOG_INFO("invalid value for %s[%zu] is discarded: %llu > %llu",

               field_name.c_str(), n, parsed_value,