mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 19:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix SF # 626275, missing DECREF's in embedding example

Browse source 
Tested w/valgrind, all paths except the return on PyInt_AsLong() failure
I think I got all of these right.

Backport candidate.
This commit is contained in:
Neal Norwitz 2002-12-17 00:40:38 +00:00
parent 1bdca5e051
commit 0f30dbd991
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Doc/ext/run-func.c
View file

@ -17,6 +17,8 @@ main(int argc, char *argv[])
/* Error checking of pName left out */ /* Error checking of pName left out */
pModule = PyImport_Import(pName); pModule = PyImport_Import(pName);
Py_DECREF(pName);
if (pModule != NULL) { if (pModule != NULL) {
pDict = PyModule_GetDict(pModule); pDict = PyModule_GetDict(pModule);
/* pDict is a borrowed reference */ /* pDict is a borrowed reference */
@ -29,6 +31,8 @@ main(int argc, char *argv[])
for (i = 0; i < argc - 3; ++i) { for (i = 0; i < argc - 3; ++i) {
pValue = PyInt_FromLong(atoi(argv[i + 3])); pValue = PyInt_FromLong(atoi(argv[i + 3]));
if (!pValue) { if (!pValue) {
Py_DECREF(pArgs);
Py_DECREF(pModule);
fprintf(stderr, "Cannot convert argument\n"); fprintf(stderr, "Cannot convert argument\n");
return 1; return 1;
} }
@ -36,20 +40,22 @@ main(int argc, char *argv[])
PyTuple_SetItem(pArgs, i, pValue); PyTuple_SetItem(pArgs, i, pValue);
} }
pValue = PyObject_CallObject(pFunc, pArgs); pValue = PyObject_CallObject(pFunc, pArgs);
Py_DECREF(pArgs);
if (pValue != NULL) { if (pValue != NULL) {
printf("Result of call: %ld\n", PyInt_AsLong(pValue)); printf("Result of call: %ld\n", PyInt_AsLong(pValue));
Py_DECREF(pValue); Py_DECREF(pValue);
} }
else { else {
Py_DECREF(pModule);
PyErr_Print(); PyErr_Print();
fprintf(stderr,"Call failed\n"); fprintf(stderr,"Call failed\n");
return 1; return 1;
} }
Py_DECREF(pArgs);
/* pDict and pFunc are borrowed and must not be Py_DECREF-ed */ /* pDict and pFunc are borrowed and must not be Py_DECREF-ed */
} }
else { else {
PyErr_Print(); if (PyErr_Occurred())
PyErr_Print();
fprintf(stderr, "Cannot find function \"%s\"\n", argv[2]); fprintf(stderr, "Cannot find function \"%s\"\n", argv[2]);
} }
Py_DECREF(pModule); Py_DECREF(pModule);
@ -59,7 +65,6 @@ main(int argc, char *argv[])
fprintf(stderr, "Failed to load \"%s\"\n", argv[1]); fprintf(stderr, "Failed to load \"%s\"\n", argv[1]);
return 1; return 1;
} }
Py_DECREF(pName);
Py_Finalize(); Py_Finalize();
return 0; return 0;
} }