Fix overflow caught by ASAN.

Fix overflow caught by ASAN.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/886e5e41db5d6d42368f225785013c9308dc66bc

[dogben, 2015-12-03 20:22:27]

The CQ bit was checked by benjaminwagner@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-12-03 20:22:35]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1498923002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1498923002/1

[dogben, 2015-12-03 20:23:12]

The CQ bit was unchecked by benjaminwagner@google.com

[dogben, 2015-12-03 20:24:10]

Patchset #1 (id:1) has been deleted

[dogben, 2015-12-03 20:24:15]

The CQ bit was checked by benjaminwagner@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-12-03 20:24:18]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1498923002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1498923002/20001

[commit-bot: I haz the power, 2015-12-03 20:37:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-03 20:37:57]

Dry run: This issue passed the CQ dry run.

[dogben, 2015-12-03 20:41:33]

benjaminwagner@google.com changed reviewers:
+ msarett@google.com

[dogben, 2015-12-03 20:41:34]

I don't know if this is the correct fix, but it looks like the result of
computeNumColors isn't used unless fBitsPerPixel is 8 or less anyway.

[msarett, 2015-12-03 20:55:22]

lgtm

https://codereview.chromium.org/1498923002/diff/20001/src/codec/SkBmpCodec.cpp
File src/codec/SkBmpCodec.cpp (right):

https://codereview.chromium.org/1498923002/diff/20001/src/codec/SkBmpCodec.cp...
src/codec/SkBmpCodec.cpp:557: uint32_t maxColors = fBitsPerPixel >= 32 ?
UINT32_MAX : 1 << fBitsPerPixel;
Can we use 0 instead of UINT32_MAX?  While you're right that this value is only
used when fBitsPerPixel <= 8 (meaning there is a color table), I'd hate to think
that we *might* try to make a color table with UINT32_MAX colors.

This fix is perfect for now, but in the longer term, we should consider only
calling this function when there actually is a color table.

[msarett, 2015-12-03 21:03:47]

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

[dogben, 2015-12-04 15:57:44]

The CQ bit was checked by benjaminwagner@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-12-04 15:57:53]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1498923002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1498923002/40001

[commit-bot: I haz the power, 2015-12-04 16:13:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-04 16:13:22]

Dry run: This issue passed the CQ dry run.

[dogben, 2015-12-04 16:14:21]

On 2015/12/04 at 16:13:22, commit-bot wrote:
> Dry run: This issue passed the CQ dry run.

PTAL. I think I like this a bit better. WDYT?

[msarett, 2015-12-04 16:19:53]

LGTM

[scroggo, 2015-12-04 16:28:57]

On 2015/12/04 16:14:21, Ben Wagner wrote:
> On 2015/12/04 at 16:13:22, commit-bot wrote:
> > Dry run: This issue passed the CQ dry run.
> 
> PTAL. I think I like this a bit better. WDYT?

Agreed. lgtm

https://codereview.chromium.org/1498923002/diff/40001/src/codec/SkBmpRLECodec...
File src/codec/SkBmpRLECodec.cpp (right):

https://codereview.chromium.org/1498923002/diff/40001/src/codec/SkBmpRLECodec...
src/codec/SkBmpRLECodec.cpp:86: uint32_t numColorsToRead = fNumColors == 0 ?
maxColors : SkTMin(fNumColors, maxColors);
Can be const?

https://codereview.chromium.org/1498923002/diff/40001/src/codec/SkBmpStandard...
File src/codec/SkBmpStandardCodec.cpp (right):

https://codereview.chromium.org/1498923002/diff/40001/src/codec/SkBmpStandard...
src/codec/SkBmpStandardCodec.cpp:86: uint32_t numColorsToRead = fNumColors == 0
? maxColors : SkTMin(fNumColors, maxColors);
const?

[dogben, 2015-12-04 16:34:43]

https://codereview.chromium.org/1498923002/diff/40001/src/codec/SkBmpRLECodec...
File src/codec/SkBmpRLECodec.cpp (right):

https://codereview.chromium.org/1498923002/diff/40001/src/codec/SkBmpRLECodec...
src/codec/SkBmpRLECodec.cpp:86: uint32_t numColorsToRead = fNumColors == 0 ?
maxColors : SkTMin(fNumColors, maxColors);
On 2015/12/04 at 16:28:57, scroggo wrote:
> Can be const?

Done.

https://codereview.chromium.org/1498923002/diff/40001/src/codec/SkBmpStandard...
File src/codec/SkBmpStandardCodec.cpp (right):

https://codereview.chromium.org/1498923002/diff/40001/src/codec/SkBmpStandard...
src/codec/SkBmpStandardCodec.cpp:86: uint32_t numColorsToRead = fNumColors == 0
? maxColors : SkTMin(fNumColors, maxColors);
On 2015/12/04 at 16:28:57, scroggo wrote:
> const?

Done.

[dogben, 2015-12-04 16:34:54]

The CQ bit was checked by benjaminwagner@google.com

[dogben, 2015-12-04 16:34:54]

The patchset sent to the CQ was uploaded after l-g-t-m from msarett@google.com,
scroggo@google.com
Link to the patchset: https://codereview.chromium.org/1498923002/#ps60001
(title: "Make variable const.")

[commit-bot: I haz the power, 2015-12-04 16:35:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1498923002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1498923002/60001

[commit-bot: I haz the power, 2015-12-04 16:48:28]

Description was changed from

==========
Fix overflow caught by ASAN.

BUG=skia:
==========

to

==========
Fix overflow caught by ASAN.

BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/886e5e41db5d6d42368f225785013c9308dc66bc
==========

[commit-bot: I haz the power, 2015-12-04 16:48:29]

Committed patchset #3 (id:60001) as
https://skia.googlesource.com/skia/+/886e5e41db5d6d42368f225785013c9308dc66bc