diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2008-09-03 18:58:51 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2008-09-03 18:58:51 (GMT) |
| commit | fff953048f965b4f0a56f775d3f4ce1634df3da7 (patch) | |
| tree | 528a28abc4354994c6818caac6257c52bc0d1704 /Python | |
| parent | 658fad8aae60e6c25a102fb56884bf66577366f8 (diff) | |
| download | cpython-fff953048f965b4f0a56f775d3f4ce1634df3da7.zip cpython-fff953048f965b4f0a56f775d3f4ce1634df3da7.tar.gz cpython-fff953048f965b4f0a56f775d3f4ce1634df3da7.tar.bz2 | |
Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin.
Patch by Amaury Forgeot d'Arc, reviewed by me.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/frozenmain.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Python/frozenmain.c b/Python/frozenmain.c index 88c3465..a5e7360 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -45,7 +45,12 @@ Py_FrozenMain(int argc, char **argv) oldloc = setlocale(LC_ALL, NULL); setlocale(LC_ALL, ""); for (i = 0; i < argc; i++) { +#ifdef HAVE_BROKEN_MBSTOWCS + size_t argsize = strlen(argv[i]); +#else size_t argsize = mbstowcs(NULL, argv[i], 0); +#endif + size_t count; if (argsize == (size_t)-1) { fprintf(stderr, "Could not convert argument %d to string", i); return 1; @@ -56,7 +61,11 @@ Py_FrozenMain(int argc, char **argv) fprintf(stderr, "out of memory"); return 1; } - mbstowcs(argv_copy[i], argv[i], argsize+1); + count = mbstowcs(argv_copy[i], argv[i], argsize+1); + if (count == (size_t)-1) { + fprintf(stderr, "Could not convert argument %d to string", i); + return 1; + } } setlocale(LC_ALL, oldloc); |