diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-06-21 11:43:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-21 11:43:33 -0700 |
| commit | 95e6e6efcac831874b3d08947d1751d8f65503f9 (patch) | |
| tree | d448810969a7b4814cccffc86d5944b7cee96a48 /media/libstagefright | |
| parent | a43787a8cc513715543fb5c80c7c464e2cd51b6e (diff) | |
| parent | af2e65ca9a0415e68acfae9497ce445e96fb738a (diff) | |
| download | frameworks_av-95e6e6efcac831874b3d08947d1751d8f65503f9.zip frameworks_av-95e6e6efcac831874b3d08947d1751d8f65503f9.tar.gz frameworks_av-95e6e6efcac831874b3d08947d1751d8f65503f9.tar.bz2 | |
Merge "Workaround for corrupt Vorbis comment"
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/FLACExtractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/FLACExtractor.cpp b/media/libstagefright/FLACExtractor.cpp index 668d7f7..29bb056 100644 --- a/media/libstagefright/FLACExtractor.cpp +++ b/media/libstagefright/FLACExtractor.cpp @@ -350,7 +350,7 @@ void FLACParser::metadataCallback(const FLAC__StreamMetadata *metadata) for (FLAC__uint32 i = 0; i < vc->num_comments; ++i) { FLAC__StreamMetadata_VorbisComment_Entry *vce; vce = &vc->comments[i]; - if (mFileMetadata != 0) { + if (mFileMetadata != 0 && vce->entry != NULL) { parseVorbisComment(mFileMetadata, (const char *) vce->entry, vce->length); } |