Fix strings termination

unxed · Jun 23, 2020 · b492f5a · b492f5a
1 parent 8ff9fea
commit b492f5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/p7zip_16.02_oemcpauto.tar.gz b/p7zip_16.02_oemcpauto.tar.gz
diff --git a/p7zip_oemcp_ZipItem.cpp.patch b/p7zip_oemcp_ZipItem.cpp.patch
@@ -9,7 +9,7 @@
  #include "StdAfx.h"
 
  #include "../../../../C/CpuArch.h"
-@@ -244,6 +249,167 @@
+@@ -244,6 +249,169 @@
      #endif
    }
 
@@ -164,9 +164,11 @@
 +      const char* src = s.Ptr();
 +      size_t slen = s.Len();
 +      size_t dlen = slen * 4;
-+      const char* dest = s_utf8.GetBuf_SetEnd(dlen);
++      const char* dest = s_utf8.GetBuf_SetEnd(dlen + 1); // (source length * 4) + null termination
++
++      size_t done = iconv(cd, (char**)&src, &slen, (char**)&dest, &dlen);
++      bzero((size_t*)dest + done, 1);
 +
-+      iconv(cd, (char**)&src, &slen, (char**)&dest, &dlen);
 +      iconv_close(cd);
 +
 +      if (ConvertUTF8ToUnicode(s_utf8, res) || ignore_Utf8_Errors)