From 9ec9ef471d23ae40a955b3b105d397544b938915 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 3 Jun 2015 10:50:53 +0200
Subject: external/neon: -fsanitize=shift

Change-Id: I82255efc3a4fbcb07b6f747af6ef81124a5fb96f
---
 external/neon/UnpackedTarball_neon.mk |  1 +
 external/neon/ubsan.patch             | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 external/neon/ubsan.patch

diff --git a/external/neon/UnpackedTarball_neon.mk b/external/neon/UnpackedTarball_neon.mk
index 1b922df83d49..3a4b58a9d251 100644
--- a/external/neon/UnpackedTarball_neon.mk
+++ b/external/neon/UnpackedTarball_neon.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\
 	external/neon/neon.patch \
 	external/neon/neon_ne_set_request_flag.patch \
 	external/neon/neon_with_gnutls.patch \
+	external/neon/ubsan.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/neon/ubsan.patch b/external/neon/ubsan.patch
new file mode 100644
index 000000000000..56445fcb7e17
--- /dev/null
+++ b/external/neon/ubsan.patch
@@ -0,0 +1,11 @@
+--- src/ne_compress.c
++++ src/ne_compress.c
+@@ -81,7 +81,7 @@
+ };
+ 
+ /* Convert 'buf' to unsigned int; 'buf' must be 'unsigned char *' */
+-#define BUF2UINT(buf) (((buf)[3]<<24) + ((buf)[2]<<16) + ((buf)[1]<<8) + (buf)[0])
++#define BUF2UINT(buf) (((unsigned)((buf)[3])<<24) + ((buf)[2]<<16) + ((buf)[1]<<8) + (buf)[0])
+ 
+ #define ID1 0x1f
+ #define ID2 0x8b
-- 
cgit