Mercurial > octave
comparison src/octave-svgconvert.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 | b6f80b1d448f |
| children | c23dafed5ffd |
comparison
equal
deleted
inserted
replaced
| 30191:57aac5b9cf9d | 30192:8c8031be8072 |
|---|---|
| 830 std::vector<std::string> argv_str; | 830 std::vector<std::string> argv_str; |
| 831 | 831 |
| 832 // convert wide character strings to multibyte UTF-8 strings | 832 // convert wide character strings to multibyte UTF-8 strings |
| 833 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv; | 833 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv; |
| 834 for (int i_arg = 0; i_arg < argc; i_arg++) | 834 for (int i_arg = 0; i_arg < argc; i_arg++) |
| 835 { | 835 argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg])); |
| 836 argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg])); | 836 |
| 837 argv[i_arg] = &argv_str[i_arg][0]; | 837 // Get pointers to C strings not before vector is stable. |
| 838 } | 838 for (int i_arg = 0; i_arg < argc; i_arg++) |
| 839 argv[i_arg] = &argv_str[i_arg][0]; | |
| 839 argv[argc] = nullptr; | 840 argv[argc] = nullptr; |
| 840 | 841 |
| 841 #else | 842 #else |
| 842 int | 843 int |
| 843 main (int argc, char **argv) | 844 main (int argc, char **argv) |