From 36bad2b022014ea7161fe888fec1191d2ba6b894 Mon Sep 17 00:00:00 2001 From: thestig Date: Thu, 13 Oct 2016 13:33:03 -0700 Subject: Fix nullptr crash inXFA_FFBarcode::UpdateWidgetProperty(). BUG=chromium:655455 Review-Url: https://codereview.chromium.org/2421633002 --- xfa/fxfa/app/xfa_ffbarcode.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index 728a701c1f..4bb3ba0a4d 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -161,12 +161,16 @@ void CXFA_FFBarcode::RenderWidget(CFX_Graphics* pGS, mt.Concat(mtRotate); m_pNormalWidget->DrawWidget(pGS, &mt); } + void CXFA_FFBarcode::UpdateWidgetProperty() { CXFA_FFTextEdit::UpdateWidgetProperty(); CFWL_Barcode* pBarCodeWidget = (CFWL_Barcode*)m_pNormalWidget; CFX_WideString wsType = GetDataAcc()->GetBarcodeType(); XFA_LPCBARCODETYPEENUMINFO pBarcodeTypeInfo = XFA_GetBarcodeTypeByName(wsType.AsStringC()); + if (!pBarcodeTypeInfo) + return; + pBarCodeWidget->SetType(pBarcodeTypeInfo->eBCType); CXFA_WidgetAcc* pAcc = GetDataAcc(); int32_t intVal; @@ -216,6 +220,7 @@ void CXFA_FFBarcode::UpdateWidgetProperty() { pBarCodeWidget->SetPrintChecksum(TRUE); } } + FX_BOOL CXFA_FFBarcode::OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) { -- cgit v1.2.3