From 55469aed5acffcce3259d37418ba9e8b8e60d801 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 4 Oct 2017 11:08:45 -0400 Subject: Fix UAF in SetVisible(). SetVisible() may be called during Destroy() which may be called during SetVisible(). This fixes the latest in a family of bugs that happen after an instance is freed by code triggered by JS code while it's executing a method. The CL has a lot of protection for many of these points where JS may be executed and potentially destroy objects. The return types of many methods that may execute JS have been changed to bool, indicating whether the instance is still alive after the call. Bug: chromium:770148 Change-Id: If5a9db4d8d6aac10f4dd6b645922bb96c116684d Reviewed-on: https://pdfium-review.googlesource.com/15190 Reviewed-by: dsinclair Commit-Queue: Henrique Nakashima --- fpdfsdk/pwl/cpwl_appstream.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fpdfsdk/pwl/cpwl_appstream.cpp') diff --git a/fpdfsdk/pwl/cpwl_appstream.cpp b/fpdfsdk/pwl/cpwl_appstream.cpp index 6a19efb906..7d7f172f2f 100644 --- a/fpdfsdk/pwl/cpwl_appstream.cpp +++ b/fpdfsdk/pwl/cpwl_appstream.cpp @@ -696,7 +696,8 @@ ByteString GenerateIconAppStream(CPDF_IconFit& fit, icon.Create(cp); icon.SetIconFit(&fit); icon.SetPDFStream(pIconStream); - icon.Move(rcIcon, false, false); + if (!icon.Move(rcIcon, false, false)) + return ByteString(); ByteString sAlias = icon.GetImageAlias(); if (sAlias.GetLength() <= 0) -- cgit v1.2.3