Mercurial > octave

comparison src/octave-config.in.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 b6f80b1d448f
children d4d83344d653
comparison
equal deleted inserted replaced
30191:57aac5b9cf9d 30192:8c8031be8072
154 std::vector<std::string> argv_str; 154 std::vector<std::string> argv_str;
155 155
156 // convert wide character strings to multibyte UTF-8 strings 156 // convert wide character strings to multibyte UTF-8 strings
157 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv; 157 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv;
158 for (int i_arg = 0; i_arg < argc; i_arg++) 158 for (int i_arg = 0; i_arg < argc; i_arg++)
159 { 159 argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg]));
160 argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg])); 160
161 argv[i_arg] = &argv_str[i_arg][0]; 161 // Get pointers to C strings not before vector is stable.
162 } 162 for (int i_arg = 0; i_arg < argc; i_arg++)
163 argv[i_arg] = &argv_str[i_arg][0];
163 argv[argc] = nullptr; 164 argv[argc] = nullptr;
164 165
165 #else 166 #else
166 int 167 int
167 main (int argc, char **argv) 168 main (int argc, char **argv)