diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-07-22 20:24:54 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-07-22 20:24:54 (GMT) |
| commit | 1c8f059019d79f1891f42a2656a96919a1187967 (patch) | |
| tree | bcec768e9ca0d0e1e9e1ab80e0dfc0fe29ae758d /Python/thread.c | |
| parent | 2a545099f7ed45de1d45b45200d82c6298b75d2b (diff) | |
| download | cpython-1c8f059019d79f1891f42a2656a96919a1187967.zip cpython-1c8f059019d79f1891f42a2656a96919a1187967.tar.gz cpython-1c8f059019d79f1891f42a2656a96919a1187967.tar.bz2 | |
Issue #18520: Add a new PyStructSequence_InitType2() function, same than
PyStructSequence_InitType() except that it has a return value (0 on success,
-1 on error).
* PyStructSequence_InitType2() now raises MemoryError on memory allocation failure
* Fix also some calls to PyDict_SetItemString(): handle error
Diffstat (limited to 'Python/thread.c')
| -rw-r--r-- | Python/thread.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Python/thread.c b/Python/thread.c index 54ce875..8540942 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -399,8 +399,10 @@ PyThread_GetInfo(void) int len; #endif - if (ThreadInfoType.tp_name == 0) - PyStructSequence_InitType(&ThreadInfoType, &threadinfo_desc); + if (ThreadInfoType.tp_name == 0) { + if (PyStructSequence_InitType2(&ThreadInfoType, &threadinfo_desc) < 0) + return NULL; + } threadinfo = PyStructSequence_New(&ThreadInfoType); if (threadinfo == NULL) |