Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure the ogg extractor returns appropriate error codes."

Browse Source
This commit is contained in:
Andreas Huber
2011-05-11 08:10:42 -07:00
committed by Android (Google) Code Review
parent 496d94f234 f5c9995ddd
commit ba75239e1f
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media/libstagefright/OggExtractor.cpp
View File

@@ -378,12 +378,19 @@ status_t MyVorbisExtractor::seekToOffset(off64_t offset) {
ssize_t MyVorbisExtractor::readPage(off64_t offset, Page *page) {
uint8_t header[27];
if (mSource->readAt(offset, header, sizeof(header))
ssize_t n;
if ((n = mSource->readAt(offset, header, sizeof(header)))
< (ssize_t)sizeof(header)) {
LOGV("failed to read %d bytes at offset 0x%016llx",
sizeof(header), offset);
LOGV("failed to read %d bytes at offset 0x%016llx, got %ld bytes",
sizeof(header), offset, n);
return ERROR_IO;
if (n < 0) {
return n;
} else if (n == 0) {
return ERROR_END_OF_STREAM;
} else {
return ERROR_IO;
}
}
if (memcmp(header, "OggS", 4)) {
@@ -498,8 +505,8 @@ status_t MyVorbisExtractor::readNextPacket(MediaBuffer **out) {
packetSize);
if (n < (ssize_t)packetSize) {
LOGV("failed to read %d bytes at 0x%016llx",
packetSize, dataOffset);
LOGV("failed to read %d bytes at 0x%016llx, got %ld bytes",
packetSize, dataOffset, n);
return ERROR_IO;
}