external/poppler/UnpackedTarball_poppler.mk | 1 +
external/poppler/ubsan.patch.0 | 10 ++++++++++
2 files changed, 11 insertions(+)
New commits:
commit ea58ec34153e2f1e8506d008b52583c2aa7cf453
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Mar 2 11:07:30 2015 +0100
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
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index 3f9c9f8..b79c101 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 0000000..2db8c5a
--- /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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
