commit 837e53716b26b91a89f4d361f6a02d9bfc3962f4
author sekaiacg <sekaiacg@gmail.com> Sat Dec 11 09:28:55 2021 +0800
committer bigbiff <bigbiff@teamw.in> Sun Dec 12 17:34:36 2021 +0000
tree 8e5509704d34afffd64e2d85aef147c24feca563
parent f624b2e0106c1e48040c5a106a8e62c755086a0f

recovery: Fix the crash caused by StartIteration

In the new version of libziparchive, the default values ​​of the optional_prefix and optional_suffix parameters of the StartIteration function are changed to empty strings, and nullptr is no longer detected.

Change-Id: I66ee58a9515586700b10a3d5aa5b780a6207b33c
(cherry picked from commit a202b5aa32c10ccb64603d75157817ab13144751)

install/ZipUtil.cpp

diff --git a/install/ZipUtil.cpp b/install/ZipUtil.cpp
index 75acad9..690942a 100755
--- a/install/ZipUtil.cpp
+++ b/install/ZipUtil.cpp
@@ -56,7 +56,7 @@
     }
 
     const std::string zip_prefix(prefix_path.c_str());
-    int ret = StartIteration(zip, &cookie, zip_prefix, nullptr);
+    int ret = StartIteration(zip, &cookie, zip_prefix);
 
     if (ret != 0) {
         LOG(ERROR) << "failed to start iterating zip entries.";

twrpinstall/ZipUtil.cpp

diff --git a/twrpinstall/ZipUtil.cpp b/twrpinstall/ZipUtil.cpp
index f073a22..321e7a4 100755
--- a/twrpinstall/ZipUtil.cpp
+++ b/twrpinstall/ZipUtil.cpp
@@ -56,7 +56,7 @@
     }
     const ZipString zip_prefix(prefix_path.c_str());
 
-    int ret = StartIteration(zip, &cookie, &zip_prefix, nullptr);
+    int ret = StartIteration(zip, &cookie, &zip_prefix);
     if (ret != 0) {
         LOG(ERROR) << "failed to start iterating zip entries.";
         return false;

twrpinstall/installcommand.cpp

diff --git a/twrpinstall/installcommand.cpp b/twrpinstall/installcommand.cpp
index ad7a772..d577b38 100755
--- a/twrpinstall/installcommand.cpp
+++ b/twrpinstall/installcommand.cpp
@@ -302,7 +302,7 @@
 
   // Iterate all the entries inside COMPATIBILITY_ZIP_ENTRY and read the contents.
   void* cookie;
-  ret = StartIteration(zip_handle, &cookie, nullptr, nullptr);
+  ret = StartIteration(zip_handle, &cookie);
   if (ret != 0) {
     printf("Failed to start iterating zip entries: %s\n", ErrorCodeString(ret));
     CloseArchive(zip_handle);