diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-07-22 15:34:00 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-07-22 15:34:00 -0700 |
| commit | 3519320afaaaf373c17f9ec7d74117af3c7ab0ec (patch) | |
| tree | d1be0000c68356b9bbd8521db4cbdd01952fc9bb | |
| parent | 0c1ad5da8affcfa0b74244bf54429f36bfe7513d (diff) | |
| download | pdfium-3519320afaaaf373c17f9ec7d74117af3c7ab0ec.tar.xz | |
Mergeo to M45: Add a null pointer check to CPDF_CalRGB::v_Load().
BUG=492055
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1241923005 .
(cherry picked from commit bf4598870df6b1ebd511d61d46bc55e1d814ce2d)
Review URL: https://codereview.chromium.org/1246233003 .
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index 9e6ca67041..101a197968 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -348,6 +348,9 @@ public: FX_BOOL CPDF_CalRGB::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) { CPDF_Dictionary* pDict = pArray->GetDict(1); + if (!pDict) + return FALSE; + CPDF_Array* pParam = pDict->GetArray(FX_BSTRC("WhitePoint")); int i; for (i = 0; i < 3; i ++) { |