summaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk20/files/patch-pixbuf-security
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-11-07 22:24:32 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-11-07 22:24:32 +0000
commit58406bee8938178fc317574c4236434b0dd11a25 (patch)
treeb4fa34eca69e23769c548b4436cbf65d765e5fe2 /x11-toolkits/gtk20/files/patch-pixbuf-security
parentAdd mbox (diff)
Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).
This release notes detailing all of the new goodies in GNOME 2.8 can be found at http://www.gnome.org/start/2.8/notes/, and the list of what was fixed in GNOME 2.8.1 can be found at http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html. This release, as well as all of our others, would not have been possible without the great efforts of our FreeBSD GNOME Team. The list of current members can be found at http://www.freebsd.org/gnome/contact.html (including our newest member, Michael Johnson <ahze@FreeBSD.org>). Special thanks also goes out to all of the loyal FreeBSD GNOME users that put up with crashes and hangs to test and debug GNOME on FreeBSD. We would especially like to thank those users that provided patches for GNOME 2.7 and 2.8: Franz Klammer <klammer@webonaut.com> Piotr Smyrak <piotr.smyrak@heron.pl> Radek Kozlowski <radek@raadradd.com> Khairil Yusof <kaeru@pd.jaring.my> Yasuda Keisuke <kysd@po.harenet.ne.jp> Tom McLaughlin <tmclaugh@sdf.lonestar.org> Vladimir Grebenschikov <vova@fbsd.ru> GNOME 2.8 also features a new, FreeBSD-specific splashscreen that was designed by jimmac for GNOME 2.8, then daemonized by Franz Klammer <klammer@webonaut.com> and Radek Kozlowski <radek@raadradd.com>. As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8. There is a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh that will aid in the upgrade process. Full documentation on the GNOME 2.8 upgrade is coming following this commit. From all of us at FreeBSD GNOME, ENJOY!
Diffstat (limited to 'x11-toolkits/gtk20/files/patch-pixbuf-security')
-rw-r--r--x11-toolkits/gtk20/files/patch-pixbuf-security100
1 files changed, 0 insertions, 100 deletions
diff --git a/x11-toolkits/gtk20/files/patch-pixbuf-security b/x11-toolkits/gtk20/files/patch-pixbuf-security
deleted file mode 100644
index 6ad822a6b420..000000000000
--- a/x11-toolkits/gtk20/files/patch-pixbuf-security
+++ /dev/null
@@ -1,100 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-ico.c,v
-retrieving revision 1.34
-retrieving revision 1.34.2.1
-diff -u -r1.34 -r1.34.2.1
---- gdk-pixbuf/io-ico.c 2004/01/07 00:26:58 1.34
-+++ gdk-pixbuf/io-ico.c 2004/09/15 14:32:13 1.34.2.1
-@@ -323,6 +323,14 @@
-
- State->HeaderSize+=I;
-
-+ if (State->HeaderSize < 0) {
-+ g_set_error (error,
-+ GDK_PIXBUF_ERROR,
-+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-+ _("Invalid header in icon"));
-+ return;
-+ }
-+
- if (State->HeaderSize>State->BytesInHeaderBuf) {
- guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
- if (!tmp) {
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-xpm.c,v
-retrieving revision 1.42
-retrieving revision 1.42.2.1
-diff -u -r1.42 -r1.42.2.1
---- gdk-pixbuf/io-xpm.c 2003/03/08 20:48:58 1.42
-+++ gdk-pixbuf/io-xpm.c 2004/09/15 14:32:13 1.42.2.1
-@@ -1079,7 +1079,7 @@
- gint key = 0;
- gint current_key = 1;
- gint space = 128;
-- gchar word[128], color[128], current_color[128];
-+ gchar word[129], color[129], current_color[129];
- gchar *r;
-
- word[0] = '\0';
-@@ -1121,8 +1121,8 @@
- return NULL;
- /* accumulate color name */
- if (color[0] != '\0') {
-- strcat (color, " ");
-- space--;
-+ strncat (color, " ", space);
-+ space -= MIN (space, 1);
- }
- strncat (color, word, space);
- space -= MIN (space, strlen (word));
-@@ -1246,27 +1246,43 @@
- return NULL;
-
- }
-- if (n_col <= 0) {
-+ if (cpp <= 0 || cpp >= 32) {
- g_set_error (error,
- GDK_PIXBUF_ERROR,
- GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-- _("XPM file has invalid number of colors"));
-+ _("XPM has invalid number of chars per pixel"));
- return NULL;
--
- }
-- if (cpp <= 0 || cpp >= 32) {
-+ if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1)) {
- g_set_error (error,
- GDK_PIXBUF_ERROR,
- GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-- _("XPM has invalid number of chars per pixel"));
-+ _("XPM file has invalid number of colors"));
- return NULL;
- }
-
- /* The hash is used for fast lookups of color from chars */
- color_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-- name_buf = g_new (gchar, n_col * (cpp + 1));
-- colors = g_new (XPMColor, n_col);
-+ name_buf = g_try_malloc (n_col * (cpp + 1));
-+ if (!name_buf) {
-+ g_set_error (error,
-+ GDK_PIXBUF_ERROR,
-+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-+ _("Cannot allocate memory for loading XPM image"));
-+ g_hash_table_destroy (color_hash);
-+ return NULL;
-+ }
-+ colors = (XPMColor *) g_try_malloc (sizeof (XPMColor) * n_col);
-+ if (!colors) {
-+ g_set_error (error,
-+ GDK_PIXBUF_ERROR,
-+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-+ _("Cannot allocate memory for loading XPM image"));
-+ g_hash_table_destroy (color_hash);
-+ g_free (name_buf);
-+ return NULL;
-+ }
-
- for (cnt = 0; cnt < n_col; cnt++) {
- gchar *color_name;