diff options
| author | Andreas Huber <andih@google.com> | 2012-12-03 09:00:29 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-03 09:00:30 -0800 |
| commit | 6020ef18b39c65516a381263837899232b87d774 (patch) | |
| tree | 04a3c05102496001511738ec0106142a12a17623 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 1348d011577a0b083526055686619e901d43e550 (diff) | |
| parent | 2cac3fcde42af0f198144dc5f413dc9e6faae4cc (diff) | |
| download | frameworks_av-6020ef18b39c65516a381263837899232b87d774.zip frameworks_av-6020ef18b39c65516a381263837899232b87d774.tar.gz frameworks_av-6020ef18b39c65516a381263837899232b87d774.tar.bz2 | |
Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index b2afec7..1a62f9d 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1424,18 +1424,15 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { if (mFileMetaData != NULL) { ALOGV("chunk_data_size = %lld and data_offset = %lld", chunk_data_size, data_offset); - uint8_t *buffer = new uint8_t[chunk_data_size + 1]; + sp<ABuffer> buffer = new ABuffer(chunk_data_size + 1); if (mDataSource->readAt( - data_offset, buffer, chunk_data_size) != (ssize_t)chunk_data_size) { - delete[] buffer; - buffer = NULL; - + data_offset, buffer->data(), chunk_data_size) != (ssize_t)chunk_data_size) { return ERROR_IO; } const int kSkipBytesOfDataBox = 16; mFileMetaData->setData( kKeyAlbumArt, MetaData::TYPE_NONE, - buffer + kSkipBytesOfDataBox, chunk_data_size - kSkipBytesOfDataBox); + buffer->data() + kSkipBytesOfDataBox, chunk_data_size - kSkipBytesOfDataBox); } *offset += chunk_size; |