a49fa86cca
Security update, fixes CVE-2022-37434 in zlib.
Only applications exposing/using `inflateGetHeader()` seem to be affected,
which is not our case, so this is not critical for Godot.
Remove duplicated copy of zlib in freetype sources to force using the updated
version in `thirdparty/zlib/`.
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
(cherry picked from commit 93409b8e64)
27 lines
949 B
Diff
27 lines
949 B
Diff
diff --git a/thirdparty/minizip/ioapi.h b/thirdparty/minizip/ioapi.h
|
|
index 6c73fc4ec3..083062ffe6 100644
|
|
--- a/thirdparty/minizip/ioapi.h
|
|
+++ b/thirdparty/minizip/ioapi.h
|
|
@@ -45,6 +45,22 @@
|
|
#include <stdlib.h>
|
|
#include "zlib.h"
|
|
|
|
+/* GODOT start */
|
|
+/* Mighty Gentoo saves the day by breaking the API of their zlib.h,
|
|
+ * removing this definition of OF(args) for no practical reason
|
|
+ * worth breaking compatibility with all projects that embed minizip
|
|
+ * while trying not to diverge too much from upstream zlib.
|
|
+ * Cf. https://github.com/godotengine/godot/issues/10539
|
|
+ *
|
|
+ * "By and large, this is good open source behaviour, and fits with
|
|
+ * the gentoo _don't fuck with upstream's releases_ philosophy"
|
|
+ * -- Gentoo philosopher
|
|
+ */
|
|
+#ifndef OF /* function prototypes */
|
|
+ #define OF(args) args
|
|
+#endif
|
|
+/* GODOT end */
|
|
+
|
|
#if defined(USE_FILE32API)
|
|
#define fopen64 fopen
|
|
#define ftello64 ftell
|