Attachment #22958 for bug #59305

View | Details | Raw Unified | Return to bug 59305
Collapse All | Expand All

Lines 136-153 Link Here

(-)imlib2-1.1.0/loaders/loader_bmp.c.fix (+8 lines)
136	return 0;	136	return 0;
137	}	137	}
138		138
		139	if ((w > 32768) \|\| (h>32768))
		140	{
		141	fclose(f);
		142	return 0;
		143	}
		144
139	if (bitcount < 16)	145	if (bitcount < 16)
140	{	146	{
141	ncols = (offset - headSize - 14);	147	ncols = (offset - headSize - 14);
142	if (headSize == 12)	148	if (headSize == 12)
143	{	149	{
144	ncols /= 3;	150	ncols /= 3;
		151	if (ncols > 256) ncols = 256;
145	for (i = 0; i < ncols; i++)	152	for (i = 0; i < ncols; i++)
146	fread(&rgbQuads[i], 3, 1, f);	153	fread(&rgbQuads[i], 3, 1, f);
147	}	154	}
148	else	155	else
149	{	156	{
150	ncols /= 4;	157	ncols /= 4;
		158	if (ncols > 256) ncols = 256;
151	fread(rgbQuads, 4, ncols, f);	159	fread(rgbQuads, 4, ncols, f);
152	}	160	}
153	}	161	}

Lines 31-37 Link Here

(-)imlib2-1.1.0/loaders/Makefile.am.fix (-5 / +1 lines)
31	$(PNG_L) \	31	$(PNG_L) \
32	$(TIFF_L) \	32	$(TIFF_L) \
33	$(GIF_L) \	33	$(GIF_L) \
34	pnm.la argb.la bmp.la xpm.la tga.la gzbz2.la	34	pnm.la argb.la bmp.la xpm.la tga.la
35		35
36	jpeg_la_SOURCES = loader_jpeg.c	36	jpeg_la_SOURCES = loader_jpeg.c
37	jpeg_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs	37	jpeg_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
Lines 68-74 Link Here
68	tga_la_SOURCES = loader_tga.c	68	tga_la_SOURCES = loader_tga.c
69	tga_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs	69	tga_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
70	tga_la_LIBADD = -lImlib2	70	tga_la_LIBADD = -lImlib2
71
72	gzbz2_la_SOURCES = loader_gzbz2.c
73	gzbz2_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
74	gzbz2_la_LIBADD = -lImlib2

Return to bug 59305