diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:04:26 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:04:26 -0700 |
| commit | 4eb4d7f6c707cc2c23c806aa540d055c8832b55d (patch) | |
| tree | 43b7a7fac7b4ce08c287bfc03d09e5e1201e20d0 /core/src/fpdfdoc/doc_basic.cpp | |
| parent | 7cc97521db1e52d5927f5605de5f9a7102f8af40 (diff) | |
| download | pdfium-4eb4d7f6c707cc2c23c806aa540d055c8832b55d.tar.xz | |
Revert "Fix else-after-returns throughout pdfium."
This reverts commit 7cc97521db1e52d5927f5605de5f9a7102f8af40.
Diffstat (limited to 'core/src/fpdfdoc/doc_basic.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_basic.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/src/fpdfdoc/doc_basic.cpp b/core/src/fpdfdoc/doc_basic.cpp index 3ba109b016..9d31d15624 100644 --- a/core/src/fpdfdoc/doc_basic.cpp +++ b/core/src/fpdfdoc/doc_basic.cpp @@ -148,12 +148,13 @@ static CPDF_Object* SearchNameNode(CPDF_Dictionary* pNode, int nIndex, int& nCur if (nIndex >= nCurIndex + nCount) { nCurIndex += nCount; return NULL; + } else { + if (ppFind != NULL) { + *ppFind = pNames; + } + csName = pNames->GetString((nIndex - nCurIndex) * 2); + return pNames->GetElementValue((nIndex - nCurIndex) * 2 + 1); } - if (ppFind != NULL) { - *ppFind = pNames; - } - csName = pNames->GetString((nIndex - nCurIndex) * 2); - return pNames->GetElementValue((nIndex - nCurIndex) * 2 + 1); } CPDF_Array* pKids = pNode->GetArray(FX_BSTRC("Kids")); if (pKids == NULL) { |