summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2010-08-22 05:36:39 +0000
committerRyan Hill <dirtyepic@gentoo.org>2010-08-22 05:36:39 +0000
commit80a5422a38babeca9621343cd1b0489bce7878b0 (patch)
treeb225bd77f68fff25e439e121c2c716566e0a4ed9 /media-libs
parentFix cross compilation (diff)
downloadgentoo-2-80a5422a38babeca9621343cd1b0489bce7878b0.tar.gz
gentoo-2-80a5422a38babeca9621343cd1b0489bce7878b0.tar.bz2
gentoo-2-80a5422a38babeca9621343cd1b0489bce7878b0.zip
Fix buffer overflow in gegl_buffer_header_init() (bug #319789).
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/gegl/ChangeLog6
-rw-r--r--media-libs/gegl/files/gegl-0.1.2-buffer-overflow.patch14
-rw-r--r--media-libs/gegl/gegl-0.1.2.ebuild6
3 files changed, 24 insertions, 2 deletions
diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index 2d66d8f2a0d2..e6143372ae2a 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/gegl
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.32 2010/02/21 07:00:51 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.33 2010/08/22 05:36:39 dirtyepic Exp $
+
+ 22 Aug 2010; Ryan Hill <dirtyepic@gentoo.org> gegl-0.1.2.ebuild,
+ +files/gegl-0.1.2-buffer-overflow.patch:
+ Fix buffer overflow in gegl_buffer_header_init() (bug #319789).
21 Feb 2010; Jonathan Callen <abcd@gentoo.org> gegl-0.1.2.ebuild:
Transfer prefix keywords (no other changes)
diff --git a/media-libs/gegl/files/gegl-0.1.2-buffer-overflow.patch b/media-libs/gegl/files/gegl-0.1.2-buffer-overflow.patch
new file mode 100644
index 000000000000..ee0ed47f545d
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.1.2-buffer-overflow.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/319789
+http://git.gnome.org/browse/gegl/commit/?id=e287b94c8cb078db86d883395bd089002b405e18
+
+--- a/gegl/buffer/gegl-buffer-save.c
++++ b/gegl/buffer/gegl-buffer-save.c
+@@ -196,7 +196,7 @@ gegl_buffer_header_init (GeglBufferHeader *header,
+ gint bpp,
+ Babl* format)
+ {
+- strcpy (header->magic, "GEGL");
++ memcpy (header->magic, "GEGL", 4);
+
+ header->flags = GEGL_FLAG_HEADER;
+ header->tile_width = tile_width;
diff --git a/media-libs/gegl/gegl-0.1.2.ebuild b/media-libs/gegl/gegl-0.1.2.ebuild
index ecac2e877f4f..7238f5cd0561 100644
--- a/media-libs/gegl/gegl-0.1.2.ebuild
+++ b/media-libs/gegl/gegl-0.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.2.ebuild,v 1.3 2010/02/21 07:00:51 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.2.ebuild,v 1.4 2010/08/22 05:36:39 dirtyepic Exp $
EAPI="2"
@@ -36,6 +36,10 @@ DEPEND=">=media-libs/babl-0.1.2
svg? ( >=gnome-base/librsvg-2.14.0 )"
RDEPEND="${DEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+}
+
src_configure() {
econf --with-gtk --with-pango --with-gdk-pixbuf \
$(use_enable debug) \