Fix buffer overflow in gegl_buffer_header_init() (bug #319789).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 31 insertions, 8 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/Manifest b/media-libs/gegl/Manifest
index 634d95e48077..3cc866707375 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX gegl-0.0.18-newffmpeg.diff 889 RMD160 506707235c92c0d8c0177b46af534352b246cb89 SHA1 74efdb5af757f94c271bd8fa39d27b8f6a7016c7 SHA256 4456bd53335a382860413b4332ffa8e5b0dc7d8ff2d6ee9aa3b80758998b52d3
 AUX gegl-0.0.22-locale_h.diff 282 RMD160 e3b6efcd91de6da23442c5da5ae9eaec2ee079b5 SHA1 59d008f5b9b971d44b859927dbbe4adedbbe5104 SHA256 7cbd5937ceb20dacd5abd9bf0180422d95ae85bd79e71b6d639d4d5d7f6fa28d
 AUX gegl-0.1.0-GLIB_CFLAGS.patch 1640 RMD160 70db6199c464df0911490e44439dc2a774ff69b8 SHA1 979a612131b86a8bc49447b93af7bd68c1739ad1 SHA256 f53220f772e0ab58ebc18bd02621cfb7ea5c127685b27c371d44e99950b05ffc
+AUX gegl-0.1.2-buffer-overflow.patch 515 RMD160 b6a7daac33f6f8e72bf6363ae1740eb248a4e8e8 SHA1 7129a6166428c33af82c3c180942143c67b09ed0 SHA256 0514ea14a59cb0068f661848af054d90f22caf9bbd0ed6bb24a62ebb53437ab2
 AUX gegl-18-configure-ac.patch 12354 RMD160 ae12c9c7dab1c6251ac29d53ad141d9416a51579 SHA1 a5de6e8660bbeac0c52e6a002898f1bb5a64df02 SHA256 892f152ecc22a3d306137f498e9a5ef38fe24414573cdae7bb17f3d5d21d1581
 AUX gegl-20-configure-ac.patch 13263 RMD160 df2f13719b23f45f04dcbce5a2e611f0b21636fb SHA1 67416e82775ac6cf30346128ba83af2420aa9280 SHA256 f27a68381a41f50125e1ec20efb5913feac0ea23dbeb565364a7feeeeb77d917
 AUX replace-imgconvert-by-swsscale.patch 2154 RMD160 fcf0e6c524a3e2071e474bdb62c4ccf3df1cfa09 SHA1 b8202e020c28cd70ca7aa96421edee940abf7a9c SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc
@@ -15,13 +16,13 @@ EBUILD gegl-0.0.20.ebuild 2842 RMD160 f6fb42329104fdd83aa4534831179414cfbb9caa S
 EBUILD gegl-0.0.22.ebuild 2435 RMD160 cde926b8543b4d8e5e7f72283aa9b4ff40488e96 SHA1 ae04a21923004130c83371c2e32e24888845b626 SHA256 54f970c1781fd4ec644350bb737724464cb138fd3d3d87b6cf9be507e7bebc90
 EBUILD gegl-0.1.0-r1.ebuild 1925 RMD160 a1743c47a92b86d9be0dbc41729817503b848a18 SHA1 fc841513aecc4a4d49877833ee47f67d4b9a844c SHA256 12b00cb2d2c3d09df1154a10bf6af52e037e9ac1737b86d69e8de86b3705452e
 EBUILD gegl-0.1.0.ebuild 1763 RMD160 d0c7e0be6fe3967bd5ac9c0b124a13853f75e090 SHA1 3bf87119bf89789f50ff7bebdf048e28134618a6 SHA256 b080500ac4d7bef61b2a3b753703f84b72a2f710b50bb8fac1667f1068bc5034
-EBUILD gegl-0.1.2.ebuild 1848 RMD160 db09c136ad19d04e52b0e6aceb86af9dfb98a1d4 SHA1 283e40edbda635a9091b09b4b09c95389cd4023b SHA256 f1d425f4f7bd8a5246ae3469c5e27cddcb0931744030ed33238fef5aeb41bb01
-MISC ChangeLog 4222 RMD160 0734ad65ca03ef2d985c1443081763729de4d851 SHA1 48f41c5a3d516ba9c0f2f3a7055f1e5f08d90e79 SHA256 48b0d0a6ddaea007032352e2c584fbf970fe5e81b0cbd6f722c9e09fa436e686
+EBUILD gegl-0.1.2.ebuild 1921 RMD160 48d9307ab8d7df34790351706adc7727442c6ce7 SHA1 16b4a1d3edaf706cdf9a7cc910bf511e641ca28d SHA256 ed46e1743749223ecf974c8483150c6210ae25f9f8c2b55fb73399663561b31c
+MISC ChangeLog 4404 RMD160 2877820b2966df3aa3e6b2752ea15f61f24b71e6 SHA1 4178d3b6693252cb17ea06ebcb180c155a1a1d8e SHA256 abb53d51e7f2572cf277c24197671aaf02f8c43fb54bceff269914731e3a91b6
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkuA2iwACgkQOypDUo0oQOp6UgCgwYxxMBzpU/aj6fallooQpX3/
-5FEAoKn7rBu9x8XtfNa6hrKO5gGGT3h8
-=V19M
+iEYEARECAAYFAkxwuGQACgkQiqiDRvmkBmKSRwCgn0ktVm8KEjvT46aSa41BBbZa
+KWwAmwc0SRXHdXxjcwFiIJemOGXR5lXv
+=4a12
 -----END PGP SIGNATURE-----
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) \