Skip the channel if there is no data.
The JPX decoder needs to verify there is data associated with an image channel
before access. This was already done in one side of the if() but seems to be
missing from the other.
This Cl updates the loop to check the existance of channel data and to continue
iteration if none found.
BUG=chromium:637232
Review-Url: https://codereview.chromium.org/2291813002
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
index 9e72c50..ed93319 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -835,6 +835,9 @@
uint8_t* pScanline = pChannel + row * pitch;
for (int col = 0; col < width; ++col) {
uint8_t* pPixel = pScanline + col * image->numcomps;
+ if (!image->comps[channel].data)
+ continue;
+
int src = image->comps[channel].data[row * width + col];
src += image->comps[channel].sgnd
? 1 << (image->comps[channel].prec - 1)
@@ -851,9 +854,9 @@
uint8_t* pScanline = pChannel + row * pitch;
for (int col = 0; col < width; ++col) {
uint8_t* pPixel = pScanline + col * image->numcomps;
- if (!image->comps[channel].data) {
+ if (!image->comps[channel].data)
continue;
- }
+
int src = image->comps[channel].data[row * width + col];
src += image->comps[channel].sgnd
? 1 << (image->comps[channel].prec - 1)
