Merge pull request #6376 from nulano/fribidi-no-version

Fixed null check for fribidi_version_info in FriBiDi shim
python-pillow · Jun 30, 2022 · d66e730 · d66e730
2 parents 7527964 + c2047b8
commit d66e730
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/thirdparty/fribidi-shim/fribidi.c b/src/thirdparty/fribidi-shim/fribidi.c
@@ -33,6 +33,7 @@ static void fribidi_get_bracket_types_compat(
 
 int load_fribidi(void) {
     int error = 0;
+    const char **p_fribidi_version_info = 0;
 
     p_fribidi = 0;
 
@@ -87,20 +88,21 @@ int load_fribidi(void) {
     LOAD_FUNCTION(fribidi_get_par_embedding_levels);
 
 #ifndef _WIN32
-    fribidi_version_info = *(const char**)dlsym(p_fribidi, "fribidi_version_info");
-    if (error || (fribidi_version_info == 0)) {
+    p_fribidi_version_info = (const char**)dlsym(p_fribidi, "fribidi_version_info");
+    if (error || (p_fribidi_version_info == 0) || (*p_fribidi_version_info == 0)) {
         dlclose(p_fribidi);
         p_fribidi = 0;
         return 2;
     }
 #else
-    fribidi_version_info = *(const char**)GetProcAddress(p_fribidi, "fribidi_version_info");
-    if (error || (fribidi_version_info == 0)) {
+    p_fribidi_version_info = (const char**)GetProcAddress(p_fribidi, "fribidi_version_info");
+    if (error || (p_fribidi_version_info == 0) || (*p_fribidi_version_info == 0)) {
         FreeLibrary(p_fribidi);
         p_fribidi = 0;
         return 2;
     }
 #endif
+    fribidi_version_info = *p_fribidi_version_info;
 
     return 0;
 }