Skip to content

Commit 6328662

Browse files
committed
PyUnicode_* may return NULL
1 parent c63b0ca commit 6328662

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

src/_imaging.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4213,7 +4213,7 @@ setup_module(PyObject *m) {
42134213
extern const char *ImagingJpegVersion(void);
42144214
PyObject *jpeglib_version = PyUnicode_FromString(ImagingJpegVersion());
42154215
PyDict_SetItemString(d, "jpeglib_version", jpeglib_version);
4216-
Py_DECREF(jpeglib_version);
4216+
Py_XDECREF(jpeglib_version);
42174217
}
42184218
#endif
42194219

@@ -4222,7 +4222,7 @@ setup_module(PyObject *m) {
42224222
extern const char *ImagingJpeg2KVersion(void);
42234223
PyObject *jp2klib_version = PyUnicode_FromString(ImagingJpeg2KVersion());
42244224
PyDict_SetItemString(d, "jp2klib_version", jp2klib_version);
4225-
Py_DECREF(jp2klib_version);
4225+
Py_XDECREF(jp2klib_version);
42264226
}
42274227
#endif
42284228

@@ -4233,7 +4233,7 @@ setup_module(PyObject *m) {
42334233
#define tostr(a) tostr1(a)
42344234
PyObject *libjpeg_turbo_version = PyUnicode_FromString(tostr(LIBJPEG_TURBO_VERSION));
42354235
PyDict_SetItemString(d, "libjpeg_turbo_version", libjpeg_turbo_version);
4236-
Py_DECREF(libjpeg_turbo_version);
4236+
Py_XDECREF(libjpeg_turbo_version);
42374237
#undef tostr
42384238
#undef tostr1
42394239
#else
@@ -4249,7 +4249,7 @@ setup_module(PyObject *m) {
42494249
extern const char *ImagingImageQuantVersion(void);
42504250
PyObject *imagequant_version = PyUnicode_FromString(ImagingImageQuantVersion());
42514251
PyDict_SetItemString(d, "imagequant_version", imagequant_version);
4252-
Py_DECREF(imagequant_version);
4252+
Py_XDECREF(imagequant_version);
42534253
}
42544254
#else
42554255
have_libimagequant = Py_False;
@@ -4268,7 +4268,7 @@ setup_module(PyObject *m) {
42684268
extern const char *ImagingZipVersion(void);
42694269
PyObject *zlibversion = PyUnicode_FromString(ImagingZipVersion());
42704270
PyDict_SetItemString(d, "zlib_version", zlibversion);
4271-
Py_DECREF(zlibversion);
4271+
Py_XDECREF(zlibversion);
42724272
}
42734273
#endif
42744274

@@ -4277,7 +4277,7 @@ setup_module(PyObject *m) {
42774277
extern const char *ImagingTiffVersion(void);
42784278
PyObject *libtiff_version = PyUnicode_FromString(ImagingTiffVersion());
42794279
PyDict_SetItemString(d, "libtiff_version", libtiff_version);
4280-
Py_DECREF(libtiff_version);
4280+
Py_XDECREF(libtiff_version);
42814281

42824282
// Test for libtiff 4.0 or later, excluding libtiff 3.9.6 and 3.9.7
42834283
PyObject *support_custom_tags;
@@ -4302,7 +4302,7 @@ setup_module(PyObject *m) {
43024302

43034303
PyObject *pillow_version = PyUnicode_FromString(version);
43044304
PyDict_SetItemString(d, "PILLOW_VERSION", pillow_version);
4305-
Py_DECREF(pillow_version);
4305+
Py_XDECREF(pillow_version);
43064306

43074307
return 0;
43084308
}

src/_imagingcms.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ setup_module(PyObject *m) {
15341534
v = PyUnicode_FromFormat("%d.%d", vn / 1000, (vn / 10) % 100);
15351535
}
15361536
PyDict_SetItemString(d, "littlecms_version", v);
1537-
Py_DECREF(v);
1537+
Py_XDECREF(v);
15381538

15391539
return 0;
15401540
}

src/_imagingft.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ setup_module(PyObject *m) {
13661366

13671367
v = PyUnicode_FromFormat("%d.%d.%d", major, minor, patch);
13681368
PyDict_SetItemString(d, "freetype2_version", v);
1369-
Py_DECREF(v);
1369+
Py_XDECREF(v);
13701370

13711371
#ifdef HAVE_RAQM
13721372
#if defined(HAVE_RAQM_SYSTEM) || defined(HAVE_FRIBIDI_SYSTEM)
@@ -1392,7 +1392,7 @@ setup_module(PyObject *m) {
13921392
v = Py_None;
13931393
#endif
13941394
PyDict_SetItemString(d, "raqm_version", v);
1395-
Py_DECREF(v);
1395+
Py_XDECREF(v);
13961396

13971397
#ifdef FRIBIDI_MAJOR_VERSION
13981398
{

src/_imagingmorph.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ setup_module(PyObject *m) {
244244

245245
PyObject *version = PyUnicode_FromString("0.1");
246246
PyDict_SetItemString(d, "__version", version);
247-
Py_DECREF(version);
247+
Py_XDECREF(version);
248248

249249
return 0;
250250
}

src/_webp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ setup_module(PyObject *m) {
964964

965965
PyObject *webpdecoder_version = PyUnicode_FromString(WebPDecoderVersion_str());
966966
PyDict_SetItemString(d, "webpdecoder_version", webpdecoder_version);
967-
Py_DECREF(webpdecoder_version);
967+
Py_XDECREF(webpdecoder_version);
968968

969969
#ifdef HAVE_WEBPANIM
970970
/* Ready object types */

0 commit comments

Comments
 (0)