From 0244d40daf39caf97f47de9982f4aac88c0c8644 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 22 Sep 2015 18:28:39 -0700 Subject: Merge to XFA: Add missing 'return' keyword. Discovered with experimental Clang plugin that flags temporary objects that are immediately destroyed. patch from issue 1359063003 at patchset 1 (http://crrev.com/1359063003#ps1) A=mdempsky@chromium.org TBR=mdempsky@chromium.org Review URL: https://codereview.chromium.org/1359103002 . (cherry picked from commit f316bfe37e2fc977376e18f7534aae9824da240a) Review URL: https://codereview.chromium.org/1362863002 . --- core/src/fxge/ge/fx_ge_fontmap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src/fxge') diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 3ef5c45d4c..63d8181656 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -551,7 +551,7 @@ CFX_ByteString _FPDF_LoadTableFromTTStreamFile(IFX_FileStream* pFile, } CFX_ByteString CFX_FontMapper::GetPSNameFromTT(void* hFont) { if (m_pFontInfo == NULL) { - CFX_ByteString(); + return CFX_ByteString(); } CFX_ByteString result; FX_DWORD size = m_pFontInfo->GetFontData(hFont, 0x6e616d65, NULL, 0); -- cgit v1.2.3