commit d22c3e4869a6b75f394d0bff4b141a04cb05ce1a
author Cody Schuffelen <schuffelen@google.com> Wed Nov 20 22:12:46 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 20 22:12:46 2019 +0000
tree bd59a6f4fbf92abe8a64f5808a64e51c99288379
parent 48ba50d54f0c27927c44c2dcdb424b85cd313496
parent 41eb40ad5eab74e441c29db8e9e9b668b0906ea4

Merge "Fix incorrect match when looking for files."

host/commands/assemble_cvd/super_image_mixer.cc

diff --git a/host/commands/assemble_cvd/super_image_mixer.cc b/host/commands/assemble_cvd/super_image_mixer.cc
index 2081af4..b2ec8c2 100644
--- a/host/commands/assemble_cvd/super_image_mixer.cc
+++ b/host/commands/assemble_cvd/super_image_mixer.cc
@@ -43,6 +43,9 @@
       continue;
     }
     std::string expected_substr = "target_files-" + file_iter.second.build_id + ".zip";
+    if (expected_substr.size() > file_iter.first.size()) {
+      continue;
+    }
     auto expected_pos = file_iter.first.size() - expected_substr.size();
     if (file_iter.first.rfind(expected_substr) == expected_pos) {
       return file_iter.first;