[libexif-cvs] exif/libjpeg jpeg-data.c,1.7,1.8

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/exif/libjpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv27309

Modified Files:
	jpeg-data.c 
Log Message:


Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/exif/libjpeg/jpeg-data.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jpeg-data.c	17 Sep 2003 11:30:26 -0000	1.7
+++ jpeg-data.c	28 Sep 2003 18:01:00 -0000	1.8
@@ -206,6 +206,7 @@
 		jpeg_data_append_section (data);
 		s = &data->sections[data->count - 1];
 		s->marker = marker;
+		s->content.generic.data = NULL;
 		o += i + 1;
 
 		switch (s->marker) {
@@ -216,7 +217,9 @@
 
 			/* Read the length of the section */
 			len = ((d[o] << 8) | d[o + 1]) - 2;
+			if (len > size) { o = size; break; }
 			o += 2;
+			if (o + len > size) { o = size; break; }
 
 			switch (s->marker) {
 			case JPEG_MARKER_APP1: