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

Commit 6d27dbbc authored by Mohamed Heikal's avatar Mohamed Heikal Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Fix silent failure when ContainerReader fails during Link"

parents 4d0e87d9 1084432e
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -1446,6 +1446,13 @@ class LinkCommand {

    ContainerReaderEntry* entry;
    ContainerReader reader(input_stream.get());

    if (reader.HadError()) {
      context_->GetDiagnostics()->Error(DiagMessage(src)
                                        << "failed to read file: " << reader.GetError());
      return false;
    }

    while ((entry = reader.Next()) != nullptr) {
      if (entry->Type() == ContainerEntryType::kResTable) {
        pb::ResourceTable pb_table;