mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 81250-81253 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81250 | victor.stinner | 2010-05-17 03:13:37 +0200 (lun., 17 mai 2010) | 2 lines

  Issue #6697: Fix a crash if code of "python -c code" contains surrogates
........
  r81251 | victor.stinner | 2010-05-17 03:26:01 +0200 (lun., 17 mai 2010) | 3 lines

  PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead
  of strict) error handler to escape surrogates
........
  r81252 | victor.stinner | 2010-05-17 10:58:51 +0200 (lun., 17 mai 2010) | 6 lines

  handle_system_exit() flushs files to warranty the output order

  PyObject_Print() writes into the C object stderr, whereas PySys_WriteStderr()
  writes into the Python object sys.stderr. Each object has its own buffer, so
  call sys.stderr.flush() and fflush(stderr).
........
  r81253 | victor.stinner | 2010-05-17 11:33:42 +0200 (lun., 17 mai 2010) | 6 lines

  Fix refleak in internal_print() introduced by myself in r81251

  _PyUnicode_AsDefaultEncodedString() uses a magical PyUnicode attribute to
  automatically destroy PyUnicode_EncodeUTF8() result when the unicode string is
  destroyed.
........
This commit is contained in:
Victor Stinner 2010-05-17 09:35:44 +00:00
parent 6763514503
commit 2e71d014ea
5 changed files with 58 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/main.c
View file

@ -516,18 +516,22 @@ Py_Main(int argc, wchar_t **argv)
}
if (command) {
char *commandStr;
PyObject *commandObj = PyUnicode_FromWideChar(
command, wcslen(command));
free(command);
if (commandObj != NULL) {
sts = PyRun_SimpleStringFlags(
_PyUnicode_AsString(commandObj), &cf) != 0;
if (commandObj != NULL)
commandStr = _PyUnicode_AsString(commandObj);
else
commandStr = NULL;
if (commandStr != NULL) {
sts = PyRun_SimpleStringFlags(commandStr, &cf) != 0;
Py_DECREF(commandObj);
}
else {
PyErr_Print();
sts = 1;
}
Py_DECREF(commandObj);
} else if (module) {
sts = RunModule(module, 1);
}