ea5843b67f
* Fixes CVE-2022-40674 * Removed 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 as fixed upstream Change-Id: I8e71f9a6b013ca4c45bf8774b284be98eee71bab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141691 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
21 lines
518 B
Text
21 lines
518 B
Text
--- Objects/obmalloc.c
|
|
+++ Objects/obmalloc.c
|
|
@@ -712,8 +712,8 @@
|
|
|
|
#ifdef WITH_PYMALLOC
|
|
|
|
+#define WITH_VALGRIND
|
|
#ifdef WITH_VALGRIND
|
|
-#include <valgrind/valgrind.h>
|
|
|
|
/* If we're using GCC, use __builtin_expect() to reduce overhead of
|
|
the valgrind checks */
|
|
@@ -1430,7 +1430,7 @@
|
|
|
|
#ifdef WITH_VALGRIND
|
|
if (UNLIKELY(running_on_valgrind == -1)) {
|
|
- running_on_valgrind = RUNNING_ON_VALGRIND;
|
|
+ running_on_valgrind = 1;
|
|
}
|
|
if (UNLIKELY(running_on_valgrind)) {
|
|
return NULL;
|