AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't read random data in ICO check.

Browse Source 
Check to ensure SkStream::read succeeds before checking the result.

Review URL: https://codereview.chromium.org/656673005
This commit is contained in:
scroggo 2014-10-24 06:49:57 -07:00 committed by Commit bot
parent cee4ddf1c4
commit b752f9f838
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/images/SkImageDecoder_libico.cpp
View File

@ -405,16 +405,13 @@ DEFINE_DECODER_CREATOR(ICOImageDecoder);
static bool is_ico(SkStreamRewindable* stream) {
// Check to see if the first four bytes are 0,0,1,0
// FIXME: Is that required and sufficient?
SkAutoMalloc autoMal(4);
unsigned char* buf = (unsigned char*)autoMal.get();
stream->read((void*)buf, 4);
int reserved = read2Bytes(buf, 0);
int type = read2Bytes(buf, 2);
if (reserved != 0 || type != 1) {
// This stream does not represent an ICO image.
char buf[4];
if (stream->read((void*)buf, 4) != 4) {
return false;
}
return true;
int reserved = read2Bytes(buf, 0);
int type = read2Bytes(buf, 2);
return 0 == reserved && 1 == type;
}
static SkImageDecoder* sk_libico_dfactory(SkStreamRewindable* stream) {