public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/
Date: Sat, 20 Oct 2018 20:46:53 +0000 (UTC)	[thread overview]
Message-ID: <1540068403.6a2b56c0a796fdb00151ba69fb2c617715307905.pacho@gentoo> (raw)

commit:     6a2b56c0a796fdb00151ba69fb2c617715307905
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 20:46:33 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 20:46:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2b56c0

media-libs/libextractor: Fix gcc-8 segfault (#668044 by Toralf Förster)

Closes: https://bugs.gentoo.org/668044
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/libextractor-1.7-segfault.patch             | 19 +++++++++++++++++++
 media-libs/libextractor/libextractor-1.7.ebuild       |  5 +++++
 2 files changed, 24 insertions(+)

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 00000000000..8b44238bf07
--- /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 74dc8b4f10b..76dde5f2ac4 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
 


             reply	other threads:[~2018-10-20 20:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-20 20:46 Pacho Ramos [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-12-29 23:52 [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/ Andreas Sturmlechner
2018-12-29 22:02 Andreas Sturmlechner
2018-11-09 18:54 Andreas Sturmlechner
2018-10-21 12:20 Pacho Ramos
2018-09-16 11:42 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1540068403.6a2b56c0a796fdb00151ba69fb2c617715307905.pacho@gentoo \
    --to=pacho@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox