Mercurial > octave

comparison src/main-gui.cc @ 30192:8c8031be8072

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Windows: Don't get pointers to C strings while vector is still unstable. * src/main-cli.cc, src/main-gui.cc, src/main.in.cc, src/octave-config.in.cc, src/octave-svgconvert.cc: The memory used by a vector is not guaranteed to be stable when elements are added with push_back. Wait until vector is complete before getting the pointers to the corresponding C strings.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 21:51:03 +0200
parents 96eb9a6f868b
children 796f54d4ddbf
comparison
equal deleted inserted replaced
30191:57aac5b9cf9d 30192:8c8031be8072
109 std::vector<std::string> argv_str; 109 std::vector<std::string> argv_str;
110 110
111 // convert wide character strings to multibyte UTF-8 strings 111 // convert wide character strings to multibyte UTF-8 strings
112 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv; 112 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv;
113 for (int i_arg = 0; i_arg < argc; i_arg++) 113 for (int i_arg = 0; i_arg < argc; i_arg++)
114 { 114 argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg]));
115 argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg]));
116 115
117 // Save the string because argv_str[i_arg] may return a temporary. 116 // Get pointers to C strings not before vector is stable.
118 argv[i_arg] = octave::strsave (&argv_str[i_arg][0]); 117 for (int i_arg = 0; i_arg < argc; i_arg++)
119 } 118 argv[i_arg] = &argv_str[i_arg][0];
120 argv[argc] = nullptr; 119 argv[argc] = nullptr;
121 120
122 #else 121 #else
123 int 122 int
124 main (int argc, char **argv) 123 main (int argc, char **argv)