Prevent malformed ICO files from recursively decoding

Prevent malformed ICO files from recursively decoding

Committed: https://skia.googlesource.com/skia/+/6a9c7b1dbdd4cfa36a006a8c7cf2effd3ffe862e

[djsollen, 2014-08-26 17:04:45]

djsollen@google.com changed reviewers:
+ reed@google.com, scroggo@google.com

[reed1, 2014-08-26 17:53:34]

lgtm

https://codereview.chromium.org/511453002/diff/1/src/images/SkImageDecoder_li...
File src/images/SkImageDecoder_libico.cpp (right):

https://codereview.chromium.org/511453002/diff/1/src/images/SkImageDecoder_li...
src/images/SkImageDecoder_libico.cpp:167: // Disallow nesting ICO files within
one another
Can we add a test case/data for this?

[djsollen, 2014-08-26 17:55:02]

On 2014/08/26 17:53:34, reed1 wrote:
> lgtm
> 
>
https://codereview.chromium.org/511453002/diff/1/src/images/SkImageDecoder_li...
> File src/images/SkImageDecoder_libico.cpp (right):
> 
>
https://codereview.chromium.org/511453002/diff/1/src/images/SkImageDecoder_li...
> src/images/SkImageDecoder_libico.cpp:167: // Disallow nesting ICO files within
> one another
> Can we add a test case/data for this?

Yeah, gotta figure out how to do that in skimage when we have tests that we
expect to fail.

[djsollen, 2014-08-26 18:17:29]

The CQ bit was checked by djsollen@google.com

[commit-bot: I haz the power, 2014-08-26 18:18:23]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/djsollen@google.com/511453002/1

[commit-bot: I haz the power, 2014-08-26 18:35:19]

Committed patchset #1 (1) as 6a9c7b1dbdd4cfa36a006a8c7cf2effd3ffe862e

[scroggo, 2014-10-14 22:58:23]

lgtm

https://codereview.chromium.org/511453002/diff/1/src/images/SkImageDecoder_li...
File src/images/SkImageDecoder_libico.cpp (right):

https://codereview.chromium.org/511453002/diff/1/src/images/SkImageDecoder_li...
src/images/SkImageDecoder_libico.cpp:168: if (otherDecoder->getFormat() ==
SkImageDecoder::kICO_Format) {
We could be more aggressive here; I think the only supported sub type is PNG.