Attachment 22958 Details for Bug 59305

[patch] imlib2-1.1.0-fix.patch

imlib2-1.1.0-fix.patch (text/plain), 1.57 KB, created by Marcus Meissner on 2004-08-26 20:34:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2004-08-26 20:34:12 UTC

Size: 1.57 KB

patch

obsolete

>--- imlib2-1.1.0/loaders/loader_bmp.c.fix	2004-08-25 16:54:45.000000000 +0200
>+++ imlib2-1.1.0/loaders/loader_bmp.c	2004-08-26 11:15:09.000000000 +0200
>@@ -136,18 +136,26 @@
>            return 0;
>         }
> 
>+      if ((w > 32768) || (h>32768))
>+        {
>+           fclose(f);
>+           return 0;
>+        }
>+
>       if (bitcount < 16)
>         {
>            ncols = (offset - headSize - 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);
>              }
>         }
>--- imlib2-1.1.0/loaders/Makefile.am.fix	2004-08-26 14:15:11.742745293 +0200
>+++ imlib2-1.1.0/loaders/Makefile.am	2004-08-26 14:15:20.439213799 +0200
>@@ -31,7 +31,7 @@
> $(PNG_L) \
> $(TIFF_L) \
> $(GIF_L) \
>-pnm.la argb.la bmp.la xpm.la tga.la gzbz2.la
>+pnm.la argb.la bmp.la xpm.la tga.la
> 
> jpeg_la_SOURCES	     = loader_jpeg.c
> jpeg_la_LDFLAGS	     = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
>@@ -68,7 +68,3 @@
> tga_la_SOURCES       = loader_tga.c
> tga_la_LDFLAGS	     = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
> tga_la_LIBADD	     = -lImlib2
>-
>-gzbz2_la_SOURCES     = loader_gzbz2.c
>-gzbz2_la_LDFLAGS     = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
>-gzbz2_la_LIBADD	     = -lImlib2

Actions: View | Diff

Attachments on bug 59305: 22958