From cf8e1b281f0ece4c23568aa9a01f259aa84836f1 Mon Sep 17 00:00:00 2001 From: Bruce Dawson Date: Tue, 23 Dec 2014 11:43:16 -0800 Subject: XFA: merge patch from CL 727083002, zero local variables. Zero initialize ch to avoid possible bug - conditions are very subtle. Whether ch and iRet are read without being initialized depends on complex preconditions and cannot be determined by looking at these function. Therefore it seems prudent to zero initialize them to avoid any risk. BUG=427616 TBR=bo_xu@foxitsoftware.com Review URL: https://codereview.chromium.org/727083002 Review URL: https://codereview.chromium.org/793763005 --- core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp | 2 +- core/src/fxcrt/fx_xml_parser.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index fd94b88983..4a34de1c16 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -2084,7 +2084,7 @@ FX_INT32 CPDF_Creator::Continue(IFX_Pause *pPause) if (m_iStage < 0) { return m_iStage; } - FX_INT32 iRet; + FX_INT32 iRet = 0; while (m_iStage < 100) { if (m_iStage < 20) { iRet = WriteDoc_Stage1(pPause); diff --git a/core/src/fxcrt/fx_xml_parser.cpp b/core/src/fxcrt/fx_xml_parser.cpp index d96b38b675..ea471d4792 100644 --- a/core/src/fxcrt/fx_xml_parser.cpp +++ b/core/src/fxcrt/fx_xml_parser.cpp @@ -282,7 +282,7 @@ void CXML_Parser::GetAttrValue(CFX_WideString &value) return; } CFX_UTF8Decoder decoder; - FX_BYTE mark = 0, ch; + FX_BYTE mark = 0, ch = 0; do { while (m_dwIndex < m_dwBufferSize) { ch = m_pBuffer[m_dwIndex]; -- cgit v1.2.3