mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin.

Browse source 
Patch by Amaury Forgeot d'Arc, reviewed by me.
This commit is contained in:
Antoine Pitrou 2008-09-03 18:58:51 +00:00
parent 658fad8aae
commit fff953048f
7 changed files with 128 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Modules/python.c
View file

@ -40,7 +40,16 @@ main(int argc, char **argv)
oldloc = setlocale(LC_ALL, NULL);
setlocale(LC_ALL, "");
for (i = 0; i < argc; i++) {
#ifdef HAVE_BROKEN_MBSTOWCS
/* Some platforms have a broken implementation of
* mbstowcs which does not count the characters that
* would result from conversion. Use an upper bound.
*/
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;
@ -51,7 +60,11 @@ main(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);
res = Py_Main(argc, argv_copy);