Fix residual memory leak from narrow_argv

Author: reuk

src/cbmc/cbmc_main.cpp

@@ -35,7 +35,8 @@ extern unsigned long long irep_cmp_ne_cnt;
 int wmain(int argc, const wchar_t **argv_wide)
 {
   auto vec=narrow_argv(argc, argv_wide);
-  auto argv=vec.data();
+  auto narrow=to_c_str_array(std::begin(vec), std::end(vec));
+  auto argv=narrow.data();
 #else
 int main(int argc, const char **argv)
 {

src/clobber/clobber_main.cpp

@@ -17,7 +17,8 @@ Author: Daniel Kroening, [email protected]
 int wmain(int argc, const wchar_t **argv_wide)
 {
   auto vec=narrow_argv(argc, argv_wide);
-  auto argv=vec.data();
+  auto narrow=to_c_str_array(std::begin(vec), std::end(vec));
+  auto argv=narrow.data();
 #else
 int main(int argc, const char **argv)
 {

src/goto-analyzer/goto_analyzer_main.cpp

@@ -17,7 +17,8 @@ Author: Daniel Kroening, [email protected]
 int wmain(int argc, const wchar_t **argv_wide)
 {
   auto vec=narrow_argv(argc, argv_wide);
-  auto argv=vec.data();
+  auto narrow=to_c_str_array(std::begin(vec), std::end(vec));
+  auto argv=narrow.data();
 #else
 int main(int argc, const char **argv)
 {

src/goto-cc/goto_cc_main.cpp

@@ -46,7 +46,8 @@ int main(int argc, const char **argv)
 {
   #ifdef _MSC_VER
   auto vec=narrow_argv(argc, argv_wide);
-  auto argv=vec.data();
+  auto narrow=to_c_str_array(std::begin(vec), std::end(vec));
+  auto argv=narrow.data();
   #endif
 
   if(argv==NULL || argc<1)

src/goto-diff/goto_diff_main.cpp

@@ -27,7 +27,8 @@ extern unsigned long long irep_cmp_ne_cnt;
 int wmain(int argc, const wchar_t **argv_wide)
 {
   auto vec=narrow_argv(argc, argv_wide);
-  auto argv=vec.data();
+  auto narrow=to_c_str_array(std::begin(vec), std::end(vec));
+  auto argv=narrow.data();
 #else
 int main(int argc, const char **argv)
 {

src/goto-instrument/goto_instrument_main.cpp

@@ -17,7 +17,8 @@ Author: Daniel Kroening, [email protected]
 int wmain(int argc, const wchar_t **argv_wide)
 {
   auto vec=narrow_argv(argc, argv_wide);
-  auto argv=vec.data();
+  auto narrow=to_c_str_array(std::begin(vec), std::end(vec));
+  auto argv=narrow.data();
 #else
 int main(int argc, const char **argv)
 {

src/memory-models/mmcc_main.cpp

@@ -17,7 +17,8 @@ Author: Daniel Kroening, [email protected]
 int wmain(int argc, const wchar_t **argv_wide)
 {
   auto vec=narrow_argv(argc, argv_wide);
-  auto argv=vec.data();
+  auto narrow=to_c_str_array(std::begin(vec), std::end(vec));
+  auto argv=narrow.data();
 #else
 int main(int argc, const char **argv)
 {

src/symex/symex_main.cpp

@@ -17,7 +17,8 @@ Author: Daniel Kroening, [email protected]
 int wmain(int argc, const wchar_t **argv_wide)
 {
   auto vec=narrow_argv(argc, argv_wide);
-  auto argv=vec.data();
+  auto narrow=to_c_str_array(std::begin(vec), std::end(vec));
+  auto argv=narrow.data();
 #else
 int main(int argc, const char **argv)
 {

src/util/unicode.cpp

@@ -153,16 +153,15 @@ std::string utf32_to_utf8(const std::basic_string<unsigned int> &s)
   return result;
 }
 
-std::vector<const char *> narrow_argv(int argc, const wchar_t **argv_wide)
+std::vector<std::string> narrow_argv(int argc, const wchar_t **argv_wide)
 {
   if(argv_wide==NULL)
-    return std::vector<const char *>();
+    return std::vector<std::string>();
 
-  std::vector<const char *> argv_narrow(argc+1);
-  argv_narrow[argc]=0;
+  std::vector<std::string> argv_narrow(argc);
 
-  for(int i=0; i<argc; i++)
-    argv_narrow[i]=strdup(narrow(argv_wide[i]).c_str());
+  for(int i=0; i!=argc; ++i)
+    argv_narrow[i]=narrow(argv_wide[i]);
 
   return argv_narrow;
 }

src/util/unicode.h

@@ -10,6 +10,7 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_UTIL_UNICODE_H
 #define CPROVER_UTIL_UNICODE_H
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
@@ -27,6 +28,18 @@ std::wstring utf8_to_utf16_big_endian(const std::string &);
 std::wstring utf8_to_utf16_little_endian(const std::string &);
 std::string utf16_little_endian_to_ascii(const std::wstring &in);
 
-std::vector<const char *> narrow_argv(int argc, const wchar_t **argv_wide);
+std::vector<std::string> narrow_argv(int argc, const wchar_t **argv_wide);
+
+template <typename It>
+std::vector<const char *> to_c_str_array(It b, It e)
+{
+  // Assumes that walking the range will be faster than repeated allocation
+  std::vector<const char *> ret(std::distance(b, e) + 1, nullptr);
+  std::transform(b, e, std::begin(ret), [] (const std::string & s)
+    {
+      return s.c_str();
+    });
+  return ret;
+}
 
 #endif // CPROVER_UTIL_UNICODE_H