diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2016-12-15 15:58:22 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-15 21:48:03 +0000 |
| commit | 0b24cbd9db8b894fdabce7a27f5369b320bee7f1 (patch) | |
| tree | fc8c1dcb7e098acec2b82e7e53ae9f62fa5d8c59 /resources/invalid_images | |
| parent | 6b00a07d4fa5f9fd2feb0fc50adac0ce6a477e41 (diff) | |
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>
Diffstat (limited to 'resources/invalid_images')
| -rw-r--r-- | resources/invalid_images/b33651913.bmp | bin | 0 -> 3190 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/resources/invalid_images/b33651913.bmp b/resources/invalid_images/b33651913.bmp Binary files differnew file mode 100644 index 0000000000..5999b564ef --- /dev/null +++ b/resources/invalid_images/b33651913.bmp |
