Browse Source

If main() is called and an argument cannot be decoded, make sure to

free the copy of the command-line.

Found using Clang's static analyzer.
pull/2332/head
Brett Cannon 14 years ago
parent
commit
0b1b9ce494
  1. 3
      Misc/NEWS
  2. 1
      Modules/python.c

3
Misc/NEWS

@ -10,6 +10,9 @@ What's New in Python 3.3.0 Beta 1?
Core and Builtins
-----------------
- Fix a (most likely) very rare memory leak when calling main() and not being
able to decode a command-line argument.
- Issue #14815: Use Py_ssize_t instead of long for the object hash, to
preserve all 64 bits of hash on Win64.

1
Modules/python.c

@ -51,6 +51,7 @@ main(int argc, char **argv)
argv_copy[i] = _Py_char2wchar(argv[i], NULL);
#endif
if (!argv_copy[i]) {
free(oldloc);
fprintf(stderr, "Fatal Python error: "
"unable to decode the command line argument #%i\n",
i + 1);

Loading…
Cancel
Save