From: Lutz M?l. <lu...@us...> - 2003-09-28 18:00:21
|
Update of /cvsroot/libexif/libexif/libjpeg In directory sc8-pr-cvs1:/tmp/cvs-serv26970 Modified Files: jpeg-data.c Log Message: Index: jpeg-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libjpeg/jpeg-data.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- jpeg-data.c 17 Sep 2003 11:31:06 -0000 1.12 +++ jpeg-data.c 28 Sep 2003 18:00:06 -0000 1.13 @@ -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: |