| Index: core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
|
| index 6ccc4a345be0963e96f4ee151d69ff02f364dfa6..8972201b660df94b5f605b5b4d7e651c9f3639b5 100644
|
| --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
|
| +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
|
| @@ -1664,14 +1664,13 @@ void CPDF_CIDFont::LoadMetricsArray(CPDF_Array* pArray,
|
| FX_DWORD count = pArray->GetCount();
|
| for (FX_DWORD i = 0; i < count; i++) {
|
| CPDF_Object* pObj = pArray->GetElementValue(i);
|
| - if (pObj == NULL) {
|
| + if (!pObj)
|
| continue;
|
| - }
|
| - if (pObj->GetType() == PDFOBJ_ARRAY) {
|
| - if (width_status != 1) {
|
| +
|
| + if (CPDF_Array* pArray = pObj->AsArray()) {
|
| + if (width_status != 1)
|
| return;
|
| - }
|
| - CPDF_Array* pArray = (CPDF_Array*)pObj;
|
| +
|
| FX_DWORD count = pArray->GetCount();
|
| for (FX_DWORD j = 0; j < count; j += nElements) {
|
| result.Add(first_code);
|
|
|