search for: jpeg_decode_argb

Hi, fix a leak in jpeg_decode_argb if the decoding failed failure. This patch was taken from cog (1 year old commit). cheers, rm -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-leak-in-jpeg_decode_argb.diff Type: text/x-diff Size: 557 bytes Desc: not available Url : http://lists.freedesktop....

...0 2007 +0200 now that the jpeg lib ignores SOI and EOI properly, there's no longer a need to do it here diff --git a/libswfdec/swfdec_image.c b/libswfdec/swfdec_image.c index 128506b..5a60681 100644 --- a/libswfdec/swfdec_image.c +++ b/libswfdec/swfdec_image.c @@ -140,47 +140,23 @@ swfdec_jpeg_decode_argb (unsigned char * unsigned char *data2, int length2, void *outdata, int *width, int *height) { - unsigned char *tmpdata; - int tmplength; gboolean ret; - while (length1 >= 2 && data1[0] == 0xff && - (data1[1] == 0xd9 || data1[1] == 0xd8)) { - data1 += 2;...

...md64. Valgrind says: [for wookiemon.jpg] ==4516== Invalid write of size 1 ==4516== at 0x445D8F8: (within /usr/lib/liboil-0.3.so.0.1.0) ==4516== by 0x80497FF: jpeg_decoder_decode_entropy_segment (jpeg.c:503) ==4516== by 0x8049DEB: jpeg_decoder_decode (jpeg.c:683) ==4516== by 0x804B1E1: jpeg_decode_argb (jpeg_rgb_decoder.c:58) ==4516== by 0x8048A51: main (load.c:46) ==4516== Address 0x632C490 is 0 bytes after a block of size 0 alloc'd ==4516== at 0x442438B: malloc (vg_replace_malloc.c:149) ==4516== by 0x8049084: jpeg_decoder_init_decoder (jpeg.c:192) ==4516== by 0x8049CD3: jpeg_de...

hi, this patch checks the returns of most malloc functions called in swfdec/jpeg. This should fix bug #15528. Don't know if you like gotos :) This incorporates the patch attached to message "[PATCH] fix leak in jpeg_decode_argb". thanks, rm -------------- next part -------------- A non-text attachment was scrubbed... Name: check-malloc-return.diff Type: text/x-diff Size: 3922 bytes Desc: not available Url : http://lists.freedesktop.org/archives/swfdec/attachments/20080525/a9f1f1e7/attachment.diff

...jpeg_decoder_get_component_subsampling(JpegDecoder *dec, int id, int jpeg_decoder_get_component_ptr(JpegDecoder *dec, int id, unsigned char **image, int *rowstride); -unsigned char *jpeg_decoder_get_argb_image (JpegDecoder *dec); +uint32_t *jpeg_decoder_get_argb_image (JpegDecoder *dec); int jpeg_decode_argb (uint8_t *data, int length, uint32_t **image, int *width, int *height); diff --git a/libswfdec/jpeg/jpeg_rgb_decoder.c b/libswfdec/jpeg/jpeg_rgb_decoder.c index 6fc49c8..3c01914 100644 --- a/libswfdec/jpeg/jpeg_rgb_decoder.c +++ b/libswfdec/jpeg/jpeg_rgb_decoder.c @@ -29,10 +29,10 @@ static...

...bsampling(JpegDecoder *dec, int id, int *h_subsample, int *v_subsample); int jpeg_decoder_get_component_ptr(JpegDecoder *dec, int id, - const unsigned char **image, int *rowstride); + unsigned char **image, int *rowstride); unsigned char *jpeg_decoder_get_argb_image (JpegDecoder *dec); - +int jpeg_decode_argb (uint8_t *data, int length, uint32_t **image, + int *width, int *height); #endif diff --git a/libswfdec/jpeg/jpeg_bits.c b/libswfdec/jpeg/jpeg_bits.c new file mode 100644 index 0000000..87700e9 --- /dev/null +++ b/libswfdec/jpeg/jpeg_bits.c @@ -0,0 +1,154 @@ + +#include <stdio.h> + +#...

...#39; <repeats 200 times>... vp = (uint8_t *) 0xa974e68 '\203' <repeats 200 times>... argbp = (uint32_t *) 0x9132aa0 j = 250 halfwidth = 1 #7 0xb1aeb485 in jpeg_decoder_get_argb_image (dec=0x0) at jpeg_rgb_decoder.c:89 No locals. #8 0xb1aeb4fe in jpeg_decode_argb (data=0xafb9a57 "????", length=515, image=0xbfd7edc8, width=0xa8c85a0, height=0xa8c85a4) at jpeg_rgb_decoder.c:63 dec = (JpegDecoder *) 0xabb8d58 ret = <value optimized out> #9 0xb1a95670 in swfdec_jpeg_decode_argb (renderer=0x974f520, data1=0xafb9a57 "????&quo...

...return str; -} - static void jpeg_load_standard_huffman_tables (JpegDecoder * dec) { diff --git a/libswfdec/jpeg/jpeg.h b/libswfdec/jpeg/jpeg.h index 9caad4c..eff4c03 100644 --- a/libswfdec/jpeg/jpeg.h +++ b/libswfdec/jpeg/jpeg.h @@ -159,7 +159,7 @@ unsigned char *jpeg_decoder_get_argb_ima int jpeg_decode_argb (uint8_t *data, int length, uint32_t **image, int *width, int *height); -void jpeg_decoder_error(JpegDecoder *dec, char *fmt, ...); +void jpeg_decoder_error(JpegDecoder *dec, const char *fmt, ...); int jpeg_decoder_sof_baseline_dct(JpegDecoder *dec, JpegBits *bits); int jpeg_decoder_defi...