Fix ICO bug exposed by the fuzzer

src/codec/SkBmpCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBmpCodec.h"
 #include "SkBmpMaskCodec.h"
 #include "SkBmpRLECodec.h"
@@ skipping 424 matching lines @@
                     // since we will need to apply a transparency mask.
                     if (inIco) {
                         color = SkEncodedInfo::kBGRA_Color;
                         bitsPerComponent = 8;
                     } else {
                         color = SkEncodedInfo::kPalette_Color;
                         bitsPerComponent = (uint8_t) bitsPerPixel;
                     }
                     break;
                 case 24:
-                    color = SkEncodedInfo::kBGR_Color;
+                    // In the case of ICO, kBGRA is actually the closest match,
+                    // since we will need to apply a transparency mask.
+                    color = inIco ? SkEncodedInfo::kBGRA_Color : SkEncodedInfo::kBGR_Color;
                     bitsPerComponent = 8;
                     break;
                 case 32:
                     // 32-bit BMP-in-ICOs actually use the alpha channel in place of a
                     // transparency mask.
                     if (inIco) {
                         isOpaque = false;
                         alpha = SkEncodedInfo::kUnpremul_Alpha;
                         color = SkEncodedInfo::kBGRA_Color;
                     } else {
@@ skipping 162 matching lines @@
 }
 
 bool SkBmpCodec::skipRows(int count) {
     const size_t bytesToSkip = count * fSrcRowBytes;
     return this->stream()->skip(bytesToSkip) == bytesToSkip;
 }
 
 bool SkBmpCodec::onSkipScanlines(int count) {
     return this->skipRows(count);
 }