summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-02 11:07:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-02 11:07:30 +0100
commitea58ec34153e2f1e8506d008b52583c2aa7cf453 (patch)
tree1024c41eb164f6632cca929ad3390ec29642cdc5
parent4a58419f43907d6404190019a9c49d993969c443 (diff)
external/poppler: Work around -fsanitize=enum
...detecting an uninitialized encAlgorithm value is passed into parser->getObj (where it is presumably ignored for that specific set of arguments) in XRef::fetch. Change-Id: I511c8222ca8483aea1f475ba2aaefbc0cfb7dd5b
-rw-r--r--external/poppler/UnpackedTarball_poppler.mk1
-rw-r--r--external/poppler/ubsan.patch.010
2 files changed, 11 insertions, 0 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index 3f9c9f857357..b79c1019c45c 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-nochecknew.patch.1 \
external/poppler/poppler-vs2013.patch.1 \
external/poppler/poppler-0.26.4-std-max.patch.1 \
+ external/poppler/ubsan.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
new file mode 100644
index 000000000000..2db8c5a78028
--- /dev/null
+++ b/external/poppler/ubsan.patch.0
@@ -0,0 +1,10 @@
+--- poppler/XRef.cc
++++ poppler/XRef.cc
+@@ -293,6 +293,7 @@
+ xRefStream = gFalse;
+ scannedSpecialFlags = gFalse;
+ encrypted = gFalse;
++ encAlgorithm = cryptRC4;
+ permFlags = defPermFlags;
+ ownerPasswordOk = gFalse;
+ rootNum = -1;