diff options
| author | Tom Sepez <tsepez@chromium.org> | 2021-01-15 22:48:42 +0000 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2021-04-19 22:35:24 +0000 |
| commit | 0303f41582d21725946259786eb2fc68705cbeb6 (patch) | |
| tree | e5ae4250a979ebe9a4a4f4dc01cde44aab650ca4 | |
| parent | 7406137818bb3506999e81d658a5082930720f1a (diff) | |
[Backport] CVE-2021-21219: Uninitialized Use in PDFium
Cherry-pick of patch originally reviewed on
https://chromium-review.googlesource.com/c/chromium/src/+/2633964:
Check yet another return code from FORM_GetFocusedAnnot()
Bug: 1166972
Change-Id: I258c25573d5900e8dae2d3f26bde5eeb200fd8b1
Reviewed-by: K. Moon <kmoon@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844268}
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/pdf/pdfium/pdfium_engine.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/pdf/pdfium/pdfium_engine.cc b/chromium/pdf/pdfium/pdfium_engine.cc index 2032a9f54c7..50dcad0c597 100644 --- a/chromium/pdf/pdfium/pdfium_engine.cc +++ b/chromium/pdf/pdfium/pdfium_engine.cc @@ -1019,8 +1019,7 @@ void PDFiumEngine::UpdateFocus(bool has_focus) { FPDF_ANNOTATION last_focused_annot = nullptr; FPDF_BOOL ret = FORM_GetFocusedAnnot(form(), &last_focused_page_, &last_focused_annot); - DCHECK(ret); - if (PageIndexInBounds(last_focused_page_) && last_focused_annot) { + if (ret && PageIndexInBounds(last_focused_page_) && last_focused_annot) { last_focused_annot_index_ = FPDFPage_GetAnnotIndex( pages_[last_focused_page_]->GetPage(), last_focused_annot); } else { |