diff options
| author | vanilla <vanilla@FreeBSD.org> | 2004-10-14 14:35:37 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2004-10-14 14:35:37 +0800 |
| commit | 2a322f747cf439908136bfc7122dcd54e947329c (patch) | |
| tree | 837ed8da2f4f3a2dd6934fe4f17c886b0ec5531f /graphics/imlib2 | |
| parent | 33bfef0d2a6ed91a5acc30d4e5f568015f09e875 (diff) | |
| download | freebsd-ports-gnome-2a322f747cf439908136bfc7122dcd54e947329c.tar.gz freebsd-ports-gnome-2a322f747cf439908136bfc7122dcd54e947329c.tar.zst freebsd-ports-gnome-2a322f747cf439908136bfc7122dcd54e947329c.zip | |
Upgrade to 1.1.2.
Diffstat (limited to 'graphics/imlib2')
| -rw-r--r-- | graphics/imlib2/Makefile | 4 | ||||
| -rw-r--r-- | graphics/imlib2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/imlib2/files/patch-loader_bmp.c | 47 |
3 files changed, 4 insertions, 51 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index e1eb24e0b393..40865f1f9242 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -6,8 +6,8 @@ # PORTNAME= imlib2 -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 +PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= enlightenment diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index b4d438bf5e21..0f60b7cbfda3 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1,2 +1,2 @@ -MD5 (imlib2-1.1.1.tar.gz) = 06b629285c163cd61a59db89377a0520 -SIZE (imlib2-1.1.1.tar.gz) = 871202 +MD5 (imlib2-1.1.2.tar.gz) = 3389bad516032c951fda4fe620df0cef +SIZE (imlib2-1.1.2.tar.gz) = 875843 diff --git a/graphics/imlib2/files/patch-loader_bmp.c b/graphics/imlib2/files/patch-loader_bmp.c deleted file mode 100644 index ac490d37ec92..000000000000 --- a/graphics/imlib2/files/patch-loader_bmp.c +++ /dev/null @@ -1,47 +0,0 @@ -=================================================================== -RCS file: /cvsroot/enlightenment/e17/libs/imlib2/loaders/loader_bmp.c,v -retrieving revision 1.13 -retrieving revision 1.15 -diff -u -r1.13 -r1.15 ---- loaders/loader_bmp.c 2004/02/09 01:26:03 1.13 -+++ loaders/loader_bmp.c 2004/08/28 03:34:05 1.15 -@@ -111,6 +111,11 @@ - fseek(f, 8, SEEK_CUR); - ReadleLong(f, &offset); - ReadleLong(f, &headSize); -+ if (offset >= size) -+ { -+ fclose(f); -+ return 0; -+ } - if (headSize == 12) - { - ReadleShort(f, &tmpShort); -@@ -139,6 +144,12 @@ - fclose(f); - return 0; - } -+ -+ if ((w > 8192) || (h > 8192)) -+ { -+ fclose(f); -+ return 0; -+ } - - if (bitcount < 16) - { -@@ -146,12 +157,14 @@ - if (headSize == 12) - { - ncols /= 3; -+ if (ncols > 256) ncols = 256; - for (i = 0; i < ncols; i++) - fread(&rgbQuads[i], 3, 1, f); - } - else - { - ncols /= 4; -+ if (ncols > 256) ncols = 256; - fread(rgbQuads, 4, ncols, f); - } - } |