python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 01:34:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

avoid NULL in fribidi shim

Browse Source
This commit is contained in:
nulano 2020-11-25 16:32:37 +00:00 committed by Andrew Murray
parent 834c2e5e5d
commit c3fce854f2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/thirdparty/fribidi-shim/fribidi.c vendored
View File

@ -13,7 +13,7 @@
int load_fribidi(void) { int load_fribidi(void) {
int error = 0; int error = 0;
p_fribidi = NULL; p_fribidi = 0;
/* Microsoft needs a totally different system */ /* Microsoft needs a totally different system */
#ifndef _WIN32 #ifndef _WIN32
@ -36,11 +36,11 @@ int load_fribidi(void) {
#ifndef _WIN32 #ifndef _WIN32
#define LOAD_FUNCTION(func) \ #define LOAD_FUNCTION(func) \
func = (t_##func)dlsym(p_fribidi, #func); \ func = (t_##func)dlsym(p_fribidi, #func); \
error = error || (func == NULL); error = error || (func == 0);
#else #else
#define LOAD_FUNCTION(func) \ #define LOAD_FUNCTION(func) \
func = (t_##func)GetProcAddress(p_fribidi, #func); \ func = (t_##func)GetProcAddress(p_fribidi, #func); \
error = error || (func == NULL); error = error || (func == 0);
#endif #endif
LOAD_FUNCTION(fribidi_get_bidi_types); LOAD_FUNCTION(fribidi_get_bidi_types);
@ -52,16 +52,16 @@ int load_fribidi(void) {
#ifndef _WIN32 #ifndef _WIN32
fribidi_version_info = *(const char**)dlsym(p_fribidi, "fribidi_version_info"); fribidi_version_info = *(const char**)dlsym(p_fribidi, "fribidi_version_info");
if (dlerror() || error || (fribidi_version_info == NULL)) { if (dlerror() || error || (fribidi_version_info == 0)) {
dlclose(p_fribidi); dlclose(p_fribidi);
p_fribidi = NULL; p_fribidi = 0;
return 2; return 2;
} }
#else #else
fribidi_version_info = *(const char**)GetProcAddress(p_fribidi, "fribidi_version_info"); fribidi_version_info = *(const char**)GetProcAddress(p_fribidi, "fribidi_version_info");
if (error || (fribidi_version_info == NULL)) { if (error || (fribidi_version_info == 0)) {
FreeLibrary(p_fribidi); FreeLibrary(p_fribidi);
p_fribidi = NULL; p_fribidi = 0;
return 2; return 2;
} }
#endif #endif