Mercurial > octave
comparison src/main-cli.cc @ 30192:8c8031be8072
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 |
|---|---|
| 96 std::vector<std::string> argv_str; | 96 std::vector<std::string> argv_str; |
| 97 | 97 |
| 98 // convert wide character strings to multibyte UTF-8 strings | 98 // convert wide character strings to multibyte UTF-8 strings |
| 99 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv; | 99 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv; |
| 100 for (int i_arg = 0; i_arg < argc; i_arg++) | 100 for (int i_arg = 0; i_arg < argc; i_arg++) |
| 101 { | 101 argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg])); |
| 102 argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg])); | |
| 103 | 102 |
| 104 // Save the string because argv_str[i_arg] may return a temporary. | 103 // Get pointers to C strings not before vector is stable. |
| 105 argv[i_arg] = octave::strsave (&argv_str[i_arg][0]); | 104 for (int i_arg = 0; i_arg < argc; i_arg++) |
| 106 } | 105 argv[i_arg] = &argv_str[i_arg][0]; |
| 107 argv[argc] = nullptr; | 106 argv[argc] = nullptr; |
| 108 | 107 |
| 109 #else | 108 #else |
| 110 int | 109 int |
| 111 main (int argc, char **argv) | 110 main (int argc, char **argv) |