cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to use inflateValidate in case of static zlib

Browse Source 
When static linking zlib on iOS/macOS the usage of inflateValidate is
still unnecessarily based on OS version checks. Detect at least the case
where zlib functions are definitions (as a result of compiling zlib with
a prefix), allowing for unrestricted inflateValidate usage.
This commit is contained in:
Dimitri Schoolwerth 2020-12-17 17:01:20 +01:00
parent e69f6b3e26
commit b825c1723d
No known key found for this signature in database
GPG Key ID: 9DC3A9240BDC6737
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pngrutil.c
View File

@ -24,6 +24,7 @@
defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)
# if defined(__APPLE__) && defined(__MACH__) # if defined(__APPLE__) && defined(__MACH__)
/* Determine whether inflateValidate is available by checking: /* Determine whether inflateValidate is available by checking:
* - for static zlib linking (best, but flaky and unreliable detection)
* - at run-time by OS version (best with sys zlib usage) * - at run-time by OS version (best with sys zlib usage)
* - at compile-time by minimal supported OS version * - at compile-time by minimal supported OS version
*/ */
@ -37,7 +38,16 @@
* since 1.0 (10.3 SDK). * since 1.0 (10.3 SDK).
*/ */
# include <AvailabilityMacros.h> # include <AvailabilityMacros.h>
# if defined(__clang__) && __has_builtin(__builtin_available) # ifdef inflateValidate
/* Without this (empty) check usage of inflateValidate is driven
* only by OS version while zlib with inflateValidate could be
* linked statically.
* If the system's zlib is being used inflateValidate is not a
* macro so by checking if inflateValidate is a macro the cases
* where zlib is compiled with a prefix are at least handled and
* inflateValidate can then be used regardless of OS version.
*/
# elif defined(__clang__) && __has_builtin(__builtin_available)
/* Check at run-time for availability by OS version. */ /* Check at run-time for availability by OS version. */
# define PNG_USE_ZLIB_INFLATE_VALIDATE 2 # define PNG_USE_ZLIB_INFLATE_VALIDATE 2
# elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE # elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
@ -52,7 +62,7 @@
/* Don't use if targeting pre-macOS 10.13. */ /* Don't use if targeting pre-macOS 10.13. */
# define PNG_USE_ZLIB_INFLATE_VALIDATE 0 # define PNG_USE_ZLIB_INFLATE_VALIDATE 0
# endif # endif
# endif # endif /* inflateValidate */
# endif /* __APPLE__ && __MACH__ */ # endif /* __APPLE__ && __MACH__ */
# else # else
# define PNG_USE_ZLIB_INFLATE_VALIDATE 0 # define PNG_USE_ZLIB_INFLATE_VALIDATE 0