[Libreoffice-commits] core.git: external/libxml2

[Stephan Bergmann (via logerrit)]

 external/libxml2/ubsan.patch.0 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79e15d33c8c4d5488d353de7d440c65601049d5c
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Oct 22 08:35:28 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Oct 22 11:06:12 2019 +0200

    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 at redhat.com>

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);
  	}