43d04b91e5
wget https://github.com/libexpat/libexpat/pull/550.patch -O CVE-2022-23852.patch wget https://github.com/libexpat/libexpat/pull/551.patch -O CVE-2022-23990.patch Change-Id: I1f2694abd9f577e0b4fedbf27118b52be8a1a688 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129124 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
24 lines
789 B
Diff
24 lines
789 B
Diff
--- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000
|
|
+++ misc/build/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000
|
|
@@ -81,10 +81,6 @@
|
|
# ifndef XML_BUILDING_EXPAT
|
|
/* using Expat from an application */
|
|
|
|
-# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__)
|
|
-# define XMLIMPORT __declspec(dllimport)
|
|
-# endif
|
|
-
|
|
# endif
|
|
#endif /* not defined XML_STATIC */
|
|
|
|
--- misc/expat-2.1.0/lib/xmlparse.c 2021-05-23 16:56:25.000000000 +0100
|
|
+++ misc/build/expat-2.1.0/lib/xmlparse.c 2021-05-25 12:42:11.997173600 +0100
|
|
@@ -64,6 +64,8 @@
|
|
#endif
|
|
|
|
#ifdef _WIN32
|
|
+# undef HAVE_GETRANDOM
|
|
+# undef HAVE_SYSCALL_GETRANDOM
|
|
/* force stdlib to define rand_s() */
|
|
# if ! defined(_CRT_RAND_S)
|
|
# define _CRT_RAND_S
|