commit ca5a0713073b3e93dc4a037c8ab75cb22b22babc
author Tianjie Xu <xunchang@google.com> Sun Sep 17 21:39:09 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Sep 17 21:39:09 2017 +0000
tree 82fec7ff36560d261e6dcdc9e1bd62922817cb7b
parent 6e7df82c7ba4b868487d638e641e3ba62b12211e
parent 8ba7c45e0b6165fd0b3df72abf94bea459fcef85

Merge "Fix the dangling pointer when setting up arguments of imgdiff"

tests/component/imgdiff_test.cpp

diff --git a/tests/component/imgdiff_test.cpp b/tests/component/imgdiff_test.cpp
index 3163a57..7351605 100644
--- a/tests/component/imgdiff_test.cpp
+++ b/tests/component/imgdiff_test.cpp
@@ -779,9 +779,10 @@
   // Compute patch.
   TemporaryFile patch_file;
   TemporaryDir debug_dir;
+  std::string debug_dir_arg = android::base::StringPrintf("--debug-dir=%s", debug_dir.path);
   std::vector<const char*> args = {
-    "imgdiff", "-z", "--block-limit=10", android::base::StringPrintf(
-          "--debug-dir=%s", debug_dir.path).c_str(), src_file.path, tgt_file.path, patch_file.path,
+    "imgdiff", "-z", "--block-limit=10", debug_dir_arg.c_str(), src_file.path, tgt_file.path,
+    patch_file.path,
   };
   ASSERT_EQ(0, imgdiff(args.size(), args.data()));
 
@@ -901,9 +902,10 @@
   // Compute patch.
   TemporaryFile patch_file;
   TemporaryDir debug_dir;
+  std::string debug_dir_arg = android::base::StringPrintf("--debug-dir=%s", debug_dir.path);
   std::vector<const char*> args = {
-    "imgdiff", "-z", "--block-limit=10", android::base::StringPrintf(
-          "--debug-dir=%s", debug_dir.path).c_str(), src_file.path, tgt_file.path, patch_file.path,
+    "imgdiff", "-z", "--block-limit=10", debug_dir_arg.c_str(), src_file.path, tgt_file.path,
+    patch_file.path,
   };
   ASSERT_EQ(0, imgdiff(args.size(), args.data()));
 
@@ -940,9 +942,10 @@
   // Compute patch with a limit of 20 blocks.
   TemporaryFile patch_file;
   TemporaryDir debug_dir;
+  std::string debug_dir_arg = android::base::StringPrintf("--debug-dir=%s", debug_dir.path);
   std::vector<const char*> args = {
-    "imgdiff", "-z", "--block-limit=20", android::base::StringPrintf(
-          "--debug-dir=%s", debug_dir.path).c_str(), src_file.path, tgt_file.path, patch_file.path,
+    "imgdiff", "-z", "--block-limit=20", debug_dir_arg.c_str(), src_file.path, tgt_file.path,
+    patch_file.path,
   };
   ASSERT_EQ(0, imgdiff(args.size(), args.data()));