summaryrefslogtreecommitdiff
path: root/multimedia/xmms/files/patch-xmms_bmp.c
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2018-12-21 14:22:17 +0000
committerRene Ladan <rene@FreeBSD.org>2018-12-21 14:22:17 +0000
commitdd1112a2b0969cbefc68c8e7a2657b35c7d23e02 (patch)
treec2e1247ae398f1f3cb25e16c3df9da2d46dc768d /multimedia/xmms/files/patch-xmms_bmp.c
parentnet-mgmt/collectd5: remove optional dependency on expired multimedia/xmms (diff)
Remove expired ports:
2018-12-19 net/ntop: Broken for more than 6 months 2018-12-19 textproc/ots: Broken for more than 6 months 2018-12-20 x11/xdialog: Uses obsolete glib12 2018-12-20 net/netdude: Uses obsolete glib12 2018-12-20 japanese/jmode-skk: Uses obsolete glib12 2018-12-20 print/gsview: Uses obsolete glib12 2018-12-20 x11/dgs: Uses obsolete glib12 2018-12-20 japanese/jmode: Uses obsolete glib12 2018-12-20 multimedia/xmms: Uses obsolete glib12
Notes
Notes: svn path=/head/; revision=488006
Diffstat (limited to 'multimedia/xmms/files/patch-xmms_bmp.c')
-rw-r--r--multimedia/xmms/files/patch-xmms_bmp.c43
1 files changed, 0 insertions, 43 deletions
diff --git a/multimedia/xmms/files/patch-xmms_bmp.c b/multimedia/xmms/files/patch-xmms_bmp.c
deleted file mode 100644
index 8ee8e7c6f6ca..000000000000
--- a/multimedia/xmms/files/patch-xmms_bmp.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- xmms/bmp.c.orig 2006-07-16 13:40:04 UTC
-+++ xmms/bmp.c
-@@ -19,6 +19,12 @@
- */
- #include "xmms.h"
-
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- struct rgb_quad
- {
- guchar rgbBlue;
-@@ -183,7 +189,7 @@ GdkPixmap *read_bmp(gchar * filename)
- }
- else if (bitcount != 24 && bitcount != 16 && bitcount != 32)
- {
-- gint ncols, i;
-+ guint32 ncols, i;
-
- ncols = offset - headSize - 14;
- if (headSize == 12)
-@@ -201,9 +207,17 @@ GdkPixmap *read_bmp(gchar * filename)
- }
- }
- fseek(file, offset, SEEK_SET);
-+ /* verify buffer size */
-+ if (!h || !w ||
-+ w > (((UINT32_MAX - 3) / 3) / h) ||
-+ h > (((UINT32_MAX - 3) / 3) / w)) {
-+ g_warning("read_bmp(): width(%u)*height(%u) too large", w, h);
-+ fclose(file);
-+ return NULL;
-+ }
-+ data = g_malloc0((w * 3 * h) + 3); /* +3 is just for safety */
- buffer = g_malloc(imgsize);
- fread(buffer, imgsize, 1, file);
-- data = g_malloc0((w * 3 * h) + 3); /* +3 is just for safety */
-
- if (bitcount == 1)
- read_1b_rgb(buffer, imgsize, data, w, h, rgb_quads);