summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/FLACExtractor.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-06-19 14:44:41 -0700
committerGlenn Kasten <gkasten@google.com>2012-06-19 14:44:54 -0700
commitaf2e65ca9a0415e68acfae9497ce445e96fb738a (patch)
tree4fef670d32c695293bc3bc24e63978aec6c8a440 /media/libstagefright/FLACExtractor.cpp
parent1222bb9d9551cdf84923ea342ca3f4210867bd9a (diff)
downloadframeworks_av-af2e65ca9a0415e68acfae9497ce445e96fb738a.zip
frameworks_av-af2e65ca9a0415e68acfae9497ce445e96fb738a.tar.gz
frameworks_av-af2e65ca9a0415e68acfae9497ce445e96fb738a.tar.bz2
Workaround for corrupt Vorbis comment
Bug: 6682991 Change-Id: I8b0d91ab76b700ab981f2524124109234023a9da
Diffstat (limited to 'media/libstagefright/FLACExtractor.cpp')
-rw-r--r--media/libstagefright/FLACExtractor.cpp2
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);
}