Avoid nullptr access in sycc422_to_rgb and sycc420_to_rgb BUG=648127 Review-Url: https://codereview.chromium.org/2351623002
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp index a1c38d0..e64fa47 100644 --- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -247,6 +247,9 @@ const int* y = img->comps[0].data; const int* cb = img->comps[1].data; const int* cr = img->comps[2].data; + if (!y || !cb || !cr) + return; + int *d0, *d1, *d2, *r, *g, *b; d0 = r = FX_Alloc(int, max_size.ValueOrDie()); d1 = g = FX_Alloc(int, max_size.ValueOrDie()); @@ -324,6 +327,9 @@ const int* y = img->comps[0].data; const int* cb = img->comps[1].data; const int* cr = img->comps[2].data; + if (!y || !cb || !cr) + return; + const int* ny = nullptr; int* nr = nullptr; int* ng = nullptr;