PyUnicode_* may return NULL

This commit is contained in:
Andrew Murray 2023-03-20 17:34:34 +11:00
parent c63b0ca210
commit 6328662248
5 changed files with 12 additions and 12 deletions

View File

@ -4213,7 +4213,7 @@ setup_module(PyObject *m) {
extern const char *ImagingJpegVersion(void); extern const char *ImagingJpegVersion(void);
PyObject *jpeglib_version = PyUnicode_FromString(ImagingJpegVersion()); PyObject *jpeglib_version = PyUnicode_FromString(ImagingJpegVersion());
PyDict_SetItemString(d, "jpeglib_version", jpeglib_version); PyDict_SetItemString(d, "jpeglib_version", jpeglib_version);
Py_DECREF(jpeglib_version); Py_XDECREF(jpeglib_version);
} }
#endif #endif
@ -4222,7 +4222,7 @@ setup_module(PyObject *m) {
extern const char *ImagingJpeg2KVersion(void); extern const char *ImagingJpeg2KVersion(void);
PyObject *jp2klib_version = PyUnicode_FromString(ImagingJpeg2KVersion()); PyObject *jp2klib_version = PyUnicode_FromString(ImagingJpeg2KVersion());
PyDict_SetItemString(d, "jp2klib_version", jp2klib_version); PyDict_SetItemString(d, "jp2klib_version", jp2klib_version);
Py_DECREF(jp2klib_version); Py_XDECREF(jp2klib_version);
} }
#endif #endif
@ -4233,7 +4233,7 @@ setup_module(PyObject *m) {
#define tostr(a) tostr1(a) #define tostr(a) tostr1(a)
PyObject *libjpeg_turbo_version = PyUnicode_FromString(tostr(LIBJPEG_TURBO_VERSION)); PyObject *libjpeg_turbo_version = PyUnicode_FromString(tostr(LIBJPEG_TURBO_VERSION));
PyDict_SetItemString(d, "libjpeg_turbo_version", libjpeg_turbo_version); PyDict_SetItemString(d, "libjpeg_turbo_version", libjpeg_turbo_version);
Py_DECREF(libjpeg_turbo_version); Py_XDECREF(libjpeg_turbo_version);
#undef tostr #undef tostr
#undef tostr1 #undef tostr1
#else #else
@ -4249,7 +4249,7 @@ setup_module(PyObject *m) {
extern const char *ImagingImageQuantVersion(void); extern const char *ImagingImageQuantVersion(void);
PyObject *imagequant_version = PyUnicode_FromString(ImagingImageQuantVersion()); PyObject *imagequant_version = PyUnicode_FromString(ImagingImageQuantVersion());
PyDict_SetItemString(d, "imagequant_version", imagequant_version); PyDict_SetItemString(d, "imagequant_version", imagequant_version);
Py_DECREF(imagequant_version); Py_XDECREF(imagequant_version);
} }
#else #else
have_libimagequant = Py_False; have_libimagequant = Py_False;
@ -4268,7 +4268,7 @@ setup_module(PyObject *m) {
extern const char *ImagingZipVersion(void); extern const char *ImagingZipVersion(void);
PyObject *zlibversion = PyUnicode_FromString(ImagingZipVersion()); PyObject *zlibversion = PyUnicode_FromString(ImagingZipVersion());
PyDict_SetItemString(d, "zlib_version", zlibversion); PyDict_SetItemString(d, "zlib_version", zlibversion);
Py_DECREF(zlibversion); Py_XDECREF(zlibversion);
} }
#endif #endif
@ -4277,7 +4277,7 @@ setup_module(PyObject *m) {
extern const char *ImagingTiffVersion(void); extern const char *ImagingTiffVersion(void);
PyObject *libtiff_version = PyUnicode_FromString(ImagingTiffVersion()); PyObject *libtiff_version = PyUnicode_FromString(ImagingTiffVersion());
PyDict_SetItemString(d, "libtiff_version", libtiff_version); PyDict_SetItemString(d, "libtiff_version", libtiff_version);
Py_DECREF(libtiff_version); Py_XDECREF(libtiff_version);
// Test for libtiff 4.0 or later, excluding libtiff 3.9.6 and 3.9.7 // Test for libtiff 4.0 or later, excluding libtiff 3.9.6 and 3.9.7
PyObject *support_custom_tags; PyObject *support_custom_tags;
@ -4302,7 +4302,7 @@ setup_module(PyObject *m) {
PyObject *pillow_version = PyUnicode_FromString(version); PyObject *pillow_version = PyUnicode_FromString(version);
PyDict_SetItemString(d, "PILLOW_VERSION", pillow_version); PyDict_SetItemString(d, "PILLOW_VERSION", pillow_version);
Py_DECREF(pillow_version); Py_XDECREF(pillow_version);
return 0; return 0;
} }

View File

@ -1534,7 +1534,7 @@ setup_module(PyObject *m) {
v = PyUnicode_FromFormat("%d.%d", vn / 1000, (vn / 10) % 100); v = PyUnicode_FromFormat("%d.%d", vn / 1000, (vn / 10) % 100);
} }
PyDict_SetItemString(d, "littlecms_version", v); PyDict_SetItemString(d, "littlecms_version", v);
Py_DECREF(v); Py_XDECREF(v);
return 0; return 0;
} }

View File

@ -1366,7 +1366,7 @@ setup_module(PyObject *m) {
v = PyUnicode_FromFormat("%d.%d.%d", major, minor, patch); v = PyUnicode_FromFormat("%d.%d.%d", major, minor, patch);
PyDict_SetItemString(d, "freetype2_version", v); PyDict_SetItemString(d, "freetype2_version", v);
Py_DECREF(v); Py_XDECREF(v);
#ifdef HAVE_RAQM #ifdef HAVE_RAQM
#if defined(HAVE_RAQM_SYSTEM) || defined(HAVE_FRIBIDI_SYSTEM) #if defined(HAVE_RAQM_SYSTEM) || defined(HAVE_FRIBIDI_SYSTEM)
@ -1392,7 +1392,7 @@ setup_module(PyObject *m) {
v = Py_None; v = Py_None;
#endif #endif
PyDict_SetItemString(d, "raqm_version", v); PyDict_SetItemString(d, "raqm_version", v);
Py_DECREF(v); Py_XDECREF(v);
#ifdef FRIBIDI_MAJOR_VERSION #ifdef FRIBIDI_MAJOR_VERSION
{ {

View File

@ -244,7 +244,7 @@ setup_module(PyObject *m) {
PyObject *version = PyUnicode_FromString("0.1"); PyObject *version = PyUnicode_FromString("0.1");
PyDict_SetItemString(d, "__version", version); PyDict_SetItemString(d, "__version", version);
Py_DECREF(version); Py_XDECREF(version);
return 0; return 0;
} }

View File

@ -964,7 +964,7 @@ setup_module(PyObject *m) {
PyObject *webpdecoder_version = PyUnicode_FromString(WebPDecoderVersion_str()); PyObject *webpdecoder_version = PyUnicode_FromString(WebPDecoderVersion_str());
PyDict_SetItemString(d, "webpdecoder_version", webpdecoder_version); PyDict_SetItemString(d, "webpdecoder_version", webpdecoder_version);
Py_DECREF(webpdecoder_version); Py_XDECREF(webpdecoder_version);
#ifdef HAVE_WEBPANIM #ifdef HAVE_WEBPANIM
/* Ready object types */ /* Ready object types */