From 8890e3f44d786b48deeec42288da58149f0c9703 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 2 Jun 2015 18:22:56 +0200
Subject: external/poppler: -fsanitize=nonnull-attribute

Change-Id: I17c825a0e24e8993503eeaf0d1136c143d990a12
---
 external/poppler/ubsan.patch.0 | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'external/poppler')

diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index 2b0b334b23e1..623858da9f1f 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -1,3 +1,14 @@
+--- goo/GooString.cc
++++ goo/GooString.cc
+@@ -161,7 +161,7 @@
+       // assert(s != s1) the roundedSize condition ensures this
+       if (newLength < length) {
+ 	memcpy(s1, s, newLength);
+-      } else {
++      } else if (length != 0) {
+ 	memcpy(s1, s, length);
+       }
+       if (s != sStatic)
 --- poppler/Stream.cc
 +++ poppler/Stream.cc
 @@ -2966,12 +2966,12 @@
-- 
cgit