diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2005-03-30 09:58:37 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2005-03-30 09:58:37 +0000 |
| commit | 588d8f8d0dbb9e6e6ad619c1364103feb052237c (patch) | |
| tree | 6d403c859009c893d5499d969e4f9825b9581001 /x11-libs/gtk+/files | |
| parent | add bmp loader fix (diff) | |
| download | gentoo-2-588d8f8d0dbb9e6e6ad619c1364103feb052237c.tar.gz gentoo-2-588d8f8d0dbb9e6e6ad619c1364103feb052237c.tar.bz2 gentoo-2-588d8f8d0dbb9e6e6ad619c1364103feb052237c.zip | |
add bmp fix, mark 2.6.4-r1 x86
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-libs/gtk+/files')
| -rw-r--r-- | x11-libs/gtk+/files/digest-gtk+-2.6.4-r1 | 3 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.6.4-bmp_reject_corrupt.patch | 45 |
2 files changed, 48 insertions, 0 deletions
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.4-r1 b/x11-libs/gtk+/files/digest-gtk+-2.6.4-r1 new file mode 100644 index 000000000000..2525cd8498ef --- /dev/null +++ b/x11-libs/gtk+/files/digest-gtk+-2.6.4-r1 @@ -0,0 +1,3 @@ +MD5 4749fce7b082b784a71a076aa586dc25 gtk+-2.6.4.tar.bz2 11222426 +MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277 +MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047 diff --git a/x11-libs/gtk+/files/gtk+-2.6.4-bmp_reject_corrupt.patch b/x11-libs/gtk+/files/gtk+-2.6.4-bmp_reject_corrupt.patch new file mode 100644 index 000000000000..be3c8231d087 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.6.4-bmp_reject_corrupt.patch @@ -0,0 +1,45 @@ +=================================================================== +RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v +retrieving revision 1.46 +retrieving revision 1.46.2.2 +diff -u -r1.46 -r1.46.2.2 +--- io-bmp.c 2005/01/04 15:47:02 1.46 ++++ io-bmp.c 2005/03/28 04:12:32 1.46.2.2 +@@ -219,7 +219,19 @@ + static gboolean grow_buffer (struct bmp_progressive_state *State, + GError **error) + { +- guchar *tmp = g_try_realloc (State->buff, State->BufferSize); ++ guchar *tmp; ++ ++ if (State->BufferSize == 0) { ++ g_set_error (error, ++ GDK_PIXBUF_ERROR, ++ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, ++ _("BMP image has bogus header data")); ++ State->read_state = READ_STATE_ERROR; ++ return FALSE; ++ } ++ ++ tmp = g_try_realloc (State->buff, State->BufferSize); ++ + if (!tmp) { + g_set_error (error, + GDK_PIXBUF_ERROR, +@@ -228,6 +240,7 @@ + State->read_state = READ_STATE_ERROR; + return FALSE; + } ++ + State->buff = tmp; + return TRUE; + } +@@ -1031,7 +1044,7 @@ + gint new_y = MIN (context->compr.y, context->Header.height); + (*context->updated_func) (context->pixbuf, + 0, +- y, ++ context->Header.height - new_y, + context->Header.width, + new_y - y, + context->user_data); |