tree 12a0cae0fc5105591af640bafa261916e9918c42
parent 0c9402ed82161db41d037ef546819cc09664f17f
author Derek Sollenberger <djsollen@google.com> 1497450457 -0400
committer Derek Sollenberger <djsollen@google.com> 1497455127 +0000

Stop supporting kUnknown_BmpHeaderType

In SkBmpCodec, if the header size does not match a known header,
stop trying to create an SkCodec. We do not know of any BMPs with
arbitrarily sized headers, so this should not cause any real
regressions.

In addition, this fixes a bug where we attempt to read too much data
from a file. Since we attempt to read the header size in one read,
and a size reported by the "BMP" may be larger than SSIZE_MAX, this
will crash when reading from a file.

Add a test.

BUG:b/33651913

Change-Id: I0f3292db3124dc5ac5cbdbc07196bda130a49ba7
Reviewed-on: https://skia-review.googlesource.com/6150
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
(cherry picked from commit 0b24cbd9db8b894fdabce7a27f5369b320bee7f1)
Reviewed-on: https://skia-review.googlesource.com/19807