Skip to content

Move potential error earlier#7002

Merged
hugovk merged 1 commit intopython-pillow:mainfrom
radarhere:setup_module
Mar 12, 2023
Merged

Move potential error earlier#7002
hugovk merged 1 commit intopython-pillow:mainfrom
radarhere:setup_module

Conversation

@radarhere
Copy link
Member

@radarhere radarhere commented Mar 10, 2023

For

Pillow/src/_webp.c

Lines 956 to 974 in 6b71090

static int
setup_module(PyObject *m) {
PyObject *d = PyModule_GetDict(m);
addMuxFlagToModule(m);
addAnimFlagToModule(m);
addTransparencyFlagToModule(m);
PyDict_SetItemString(
d, "webpdecoder_version", PyUnicode_FromString(WebPDecoderVersion_str()));
#ifdef HAVE_WEBPANIM
/* Ready object types */
if (PyType_Ready(&WebPAnimDecoder_Type) < 0 ||
PyType_Ready(&WebPAnimEncoder_Type) < 0) {
return -1;
}
#endif
return 0;
}

this PR rearranges the code to run the PyType_Ready conditional first, so it the code fails earlier, and d is not created for potentially no reason (m isn't used if setup_module returns -1).

@hugovk hugovk merged commit 436ebdb into python-pillow:main Mar 12, 2023
@radarhere radarhere deleted the setup_module branch March 12, 2023 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@radarhere @hugovk