dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-01-30 16:42:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "demux: disable fragment parsing" into 0.3.0

Browse Source
This commit is contained in:
James Zern 2013-03-14 18:39:06 -07:00 committed by Gerrit Code Review
commit 166bf744b9
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/demux/demux.c
View File

@ -8,6 +8,10 @@
// WebP container demux. // WebP container demux.
// //
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -333,6 +337,7 @@ static ParseStatus ParseFrame(
return status; return status;
} }
#ifdef WEBP_EXPERIMENTAL_FEATURES
// Parse a 'FRGM' chunk and any image bearing chunks that immediately follow. // Parse a 'FRGM' chunk and any image bearing chunks that immediately follow.
// 'fragment_chunk_size' is the previously validated, padded chunk size. // 'fragment_chunk_size' is the previously validated, padded chunk size.
static ParseStatus ParseFragment(WebPDemuxer* const dmux, static ParseStatus ParseFragment(WebPDemuxer* const dmux,
@ -366,6 +371,7 @@ static ParseStatus ParseFragment(WebPDemuxer* const dmux,
if (!added_fragment) free(frame); if (!added_fragment) free(frame);
return status; return status;
} }
#endif // WEBP_EXPERIMENTAL_FEATURES
// General chunk storage starting with the header at 'start_offset' allowing // General chunk storage starting with the header at 'start_offset' allowing
// the user to request the payload via a fourcc string. 'size' includes the // the user to request the payload via a fourcc string. 'size' includes the
@ -524,10 +530,12 @@ static ParseStatus ParseVP8X(WebPDemuxer* const dmux) {
status = ParseFrame(dmux, chunk_size_padded); status = ParseFrame(dmux, chunk_size_padded);
break; break;
} }
#ifdef WEBP_EXPERIMENTAL_FEATURES
case MKFOURCC('F', 'R', 'G', 'M'): { case MKFOURCC('F', 'R', 'G', 'M'): {
status = ParseFragment(dmux, chunk_size_padded); status = ParseFragment(dmux, chunk_size_padded);
break; break;
} }
#endif
case MKFOURCC('I', 'C', 'C', 'P'): { case MKFOURCC('I', 'C', 'C', 'P'): {
store_chunk = !!(dmux->feature_flags_ & ICCP_FLAG); store_chunk = !!(dmux->feature_flags_ & ICCP_FLAG);
goto Skip; goto Skip;