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

[Stephan Bergmann]

 external/redland/UnpackedTarball_raptor.mk |    3 +++
 external/redland/raptor/ubsan.patch        |   14 ++++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit b1620451b7d6f2230f71c7c2f1896525b85a3dd0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 9 11:56:39 2015 +0100

    external/redland: Work around -fsanitize=nonnull-attribute
    
    Change-Id: Ibffc44da6e9d6fb02d43d8a2b7e143ff994d76a8

diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk
index 90a1799..f1949d1 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -15,11 +15,14 @@ $(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL),,redland))
 $(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,external/redland/raptor/raptor2.h))
 $(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,external/redland/raptor/raptor_config.h))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,raptor,0))
+
 $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
 	external/redland/raptor/raptor-freebsd.patch.1 \
 	$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/raptor/raptor-mingw.patch.1) \
 	$(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \
 	$(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \
+	external/redland/raptor/ubsan.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/raptor/ubsan.patch b/external/redland/raptor/ubsan.patch
new file mode 100644
index 0000000..4be6e6a
--- /dev/null
+++ b/external/redland/raptor/ubsan.patch
@@ -0,0 +1,14 @@
+--- src/raptor_uri.c
++++ src/raptor_uri.c
+@@ -1336,9 +1336,9 @@
+      !strncmp((const char*)base_detail->scheme, 
+               (const char*)reference_detail->scheme,
+               base_detail->scheme_len) &&
+-     !strncmp((const char*)base_detail->authority, 
++     (base_detail->authority_len == 0 || !strncmp((const char*)base_detail->authority, 
+               (const char*)reference_detail->authority,
+-              base_detail->authority_len)) {
++              base_detail->authority_len))) {
+     
+     if(!base_detail->path) {
+       if(reference_detail->path) {