diff options
| author | JUN FANG <jun_fang@foxitsoftware.com> | 2015-04-16 15:19:04 -0700 |
|---|---|---|
| committer | JUN FANG <jun_fang@foxitsoftware.com> | 2015-04-16 15:19:04 -0700 |
| commit | f66cfd7369b3c12cd0ed4c47c49377ed01727abd (patch) | |
| tree | 7aa2ca3ffd3d05c8460a2d27cec568459338a583 /xfa | |
| parent | 81ab23b0c3c419f3dc4e6cd2012f042a40a9741e (diff) | |
| download | pdfium-f66cfd7369b3c12cd0ed4c47c49377ed01727abd.tar.xz | |
Fix heap use after free in FT_Stream_ReleaseFrame
Adjust the release order of resource to fix this issue.
BUG=452793
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1082023002
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/src/fgas/src/localization/fx_datetime.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/core/fwl_noteimp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xfa/src/fgas/src/localization/fx_datetime.cpp b/xfa/src/fgas/src/localization/fx_datetime.cpp index 03ecb5bf48..7c2b3d3540 100644 --- a/xfa/src/fgas/src/localization/fx_datetime.cpp +++ b/xfa/src/fgas/src/localization/fx_datetime.cpp @@ -115,7 +115,7 @@ static void FX_DaysToDate(FX_INT64 iDays, FX_INT32 &iYear, FX_BYTE &iMonth, FX_B }
iDay += (FX_BYTE)iDays;
}
-#if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_LINUX_EMBEDDED_ || _FX_OS_ == _FX_ANDROID_ || _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
+#if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
#include <time.h>
#include <sys/time.h>
#endif
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 51041dba5b..101516fcac 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -307,7 +307,7 @@ FWL_ERR CFWL_NoteDriver::Run() }
} while (pWidgetMgr->CheckMessage_Native());
}
-#elif (_FX_OS_==_FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_LINUX_EMBEDDED_)
+#elif (_FX_OS_==_FX_LINUX_DESKTOP_)
CFWL_NoteLoop *pTopLoop = NULL;
for (;;) {
pTopLoop = GetTopLoop();
diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index b5e2547722..283c328008 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -738,7 +738,7 @@ FWL_ERR CFWL_WidgetMgrDelegate::OnDrawWidget(IFWL_Widget * pWidget, return FWL_ERR_Succeeded;
}
CFX_RectF clipBounds;
-#if (_FX_OS_==_FX_WIN32_DESKTOP_) || (_FX_OS_==_FX_WIN64_) || (_FX_OS_ == _FX_LINUX_DESKTOP_) || (_FX_OS_ == _FX_LINUX_EMBEDDED_) || (_FX_OS_ == _FX_ANDROID_)
+#if (_FX_OS_==_FX_WIN32_DESKTOP_) || (_FX_OS_==_FX_WIN64_) || (_FX_OS_ == _FX_LINUX_DESKTOP_) || (_FX_OS_ == _FX_ANDROID_)
IFWL_WidgetDelegate *pDelegate = pWidget->SetDelegate(NULL);
pDelegate->OnDrawWidget(pTemp, pMatrix);
pGraphics->GetClipRect(clipBounds);
|