summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-22 08:35:28 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-22 11:06:12 +0200
commit79e15d33c8c4d5488d353de7d440c65601049d5c (patch)
tree9f886d2cc48399fee4b9d5d5130a7fd113a2866e /external
parente7bb875b3e9b5d35e8077484b4b43fcca79d30b7 (diff)
external/libxml2: Simplify UBSan nullptr-with-offset fix
...that had been added with fcb2d8a87ad696f7f2fe069f0ed68a88803e1b54 "external/libxml2: Avoid UBSan nullptr-with-offset" Change-Id: I7ee234c8c6a868ed825a8ed3fa0dcdc69decb7ba Reviewed-on: https://gerrit.libreoffice.org/81299 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/libxml2/ubsan.patch.02
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libxml2/ubsan.patch.0 b/external/libxml2/ubsan.patch.0
index 234f66baddc2..b52259719673 100644
--- a/external/libxml2/ubsan.patch.0
+++ b/external/libxml2/ubsan.patch.0
@@ -5,7 +5,7 @@
stream = xmlPatterncompile(str, dict, XML_PATTERN_XPATH,
- &namespaces[0]);
-+ namespaces == NULL ? NULL : &namespaces[0]);
++ namespaces); // i.e., &namespaces[0] if namespaces != NULL
if (namespaces != NULL) {
xmlFree((xmlChar **)namespaces);
}