Don't read random data in ICO check.

Don't read random data in ICO check.

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

Committed: https://skia.googlesource.com/skia/+/b752f9f83891a72a39d2027eb33e3aecdea9e9e8

[scroggo, 2014-10-24 01:23:39]

scroggo@google.com changed reviewers:
+ mtklein@google.com

[mtklein, 2014-10-24 01:59:06]

lgtm

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

https://codereview.chromium.org/656673005/diff/1/src/images/SkImageDecoder_li...
src/images/SkImageDecoder_libico.cpp:405: static bool is_ico(SkStreamRewindable*
stream) {
Guh..

I know this is really secondary, but this code is a bit of an ugly duckling.

is_ico(...) {
  char buf[4];
  if (stream_read(buf, 4) != 4) {
    return false;
  }
  int reserve = read2Bytes(buf, 0),
      type    = read2Bytes(buf, 2);
  return reserved == 0 && type == 1;
}

[scroggo, 2014-10-24 13:40:48]

On 2014/10/24 01:59:06, mtklein wrote:
> lgtm
> 
>
https://codereview.chromium.org/656673005/diff/1/src/images/SkImageDecoder_li...
> File src/images/SkImageDecoder_libico.cpp (left):
> 
>
https://codereview.chromium.org/656673005/diff/1/src/images/SkImageDecoder_li...
> src/images/SkImageDecoder_libico.cpp:405: static bool
is_ico(SkStreamRewindable*
> stream) {
> Guh..
> 
> I know this is really secondary, but this code is a bit of an ugly duckling.
> 
> is_ico(...) {
>   char buf[4];
>   if (stream_read(buf, 4) != 4) {
>     return false;
>   }
>   int reserve = read2Bytes(buf, 0),
>       type    = read2Bytes(buf, 2);
>   return reserved == 0 && type == 1;
> }

To be honest, this whole file is pretty ugly...

Happy to make those changes though. Done.

[scroggo, 2014-10-24 13:40:52]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-10-24 13:41:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/656673005/20001

[commit-bot: I haz the power, 2014-10-24 13:50:01]

Committed patchset #2 (id:20001) as b752f9f83891a72a39d2027eb33e3aecdea9e9e8