summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-02 18:22:56 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-02 18:22:56 +0200
commit8890e3f44d786b48deeec42288da58149f0c9703 (patch)
tree32dafbe483408ca6811711c49c79cabfd6b13191
parentb4f9145fb4cfa8cee6fb52c647adb45712453eca (diff)
external/poppler: -fsanitize=nonnull-attribute
Change-Id: I17c825a0e24e8993503eeaf0d1136c143d990a12
-rw-r--r--external/poppler/ubsan.patch.011
1 files changed, 11 insertions, 0 deletions
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 @@