summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2018-10-20 22:46:33 +0200
committerPacho Ramos <pacho@gentoo.org>2018-10-20 22:46:43 +0200
commit6a2b56c0a796fdb00151ba69fb2c617715307905 (patch)
tree926ecd8ff86ae22140e362517369749206ed31b4 /media-libs/libextractor
parentsys-devel/crossdev: bump up to 20181020 (diff)
downloadgentoo-6a2b56c0a796fdb00151ba69fb2c617715307905.tar.gz
gentoo-6a2b56c0a796fdb00151ba69fb2c617715307905.tar.bz2
gentoo-6a2b56c0a796fdb00151ba69fb2c617715307905.zip
media-libs/libextractor: Fix gcc-8 segfault (#668044 by Toralf Förster)
Closes: https://bugs.gentoo.org/668044 Signed-off-by: Pacho Ramos <pacho@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'media-libs/libextractor')
-rw-r--r--media-libs/libextractor/files/libextractor-1.7-segfault.patch19
-rw-r--r--media-libs/libextractor/libextractor-1.7.ebuild5
2 files changed, 24 insertions, 0 deletions
diff --git a/media-libs/libextractor/files/libextractor-1.7-segfault.patch b/media-libs/libextractor/files/libextractor-1.7-segfault.patch
new file mode 100644
index 000000000000..8b44238bf076
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.7-segfault.patch
@@ -0,0 +1,19 @@
+*** a/src/plugins/ole2_extractor.c~ 2018-06-20 15:02:55.000000000 -0500
+--- b/src/plugins/ole2_extractor.c 2018-07-18 15:21:13.411495048 -0500
+***************
+*** 336,342 ****
+ (buf[1] != 0x0) ||
+ (0 != strncmp (&buf[2],
+ "SfxDocumentInfo",
+! strlen ("SfxDocumentInfo"))) ||
+ (buf[0x11] != 0x0B) ||
+ (buf[0x13] != 0x00) || /* pw protected! */
+ (buf[0x12] != 0x00) )
+--- 336,342 ----
+ (buf[1] != 0x0) ||
+ (0 != strncmp (&buf[2],
+ "SfxDocumentInfo",
+! strlen ("SfxDocumentInfo") + 1)) ||
+ (buf[0x11] != 0x0B) ||
+ (buf[0x13] != 0x00) || /* pw protected! */
+ (buf[0x12] != 0x00) )
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild b/media-libs/libextractor/libextractor-1.7.ebuild
index 74dc8b4f10b7..76dde5f2ac49 100644
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -58,6 +58,11 @@ RDEPEND="${DEPEND}
!sci-biology/glimmer
"
+PATCHES=(
+ # From Fedora
+ "${FILESDIR}"/${P}-segfault.patch
+)
+
src_prepare() {
default