From fff953048f965b4f0a56f775d3f4ce1634df3da7 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 3 Sep 2008 18:58:51 +0000 Subject: Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Patch by Amaury Forgeot d'Arc, reviewed by me. --- Python/frozenmain.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Python/frozenmain.c') diff --git a/Python/frozenmain.c b/Python/frozenmain.c index 88c34651dc..a5e73609b3 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); -- cgit v1.2.1