Marcus Meissner : hhctrl.ocx: Initialize ret on some error paths (Coverity) .
Alexandre Julliard
julliard at winehq.org
Mon Aug 20 14:16:17 CDT 2012
Module: wine
Branch: master
Commit: 2461466ba0689534081f51fe3fac7ec9cd84ee34
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2461466ba0689534081f51fe3fac7ec9cd84ee34
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Sat Aug 18 11:55:52 2012 +0200
hhctrl.ocx: Initialize ret on some error paths (Coverity).
---
dlls/hhctrl.ocx/chm.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c
index 02931f4..6c2904d 100644
--- a/dlls/hhctrl.ocx/chm.c
+++ b/dlls/hhctrl.ocx/chm.c
@@ -326,7 +326,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
HH_WINTYPEW wintype;
HRESULT hr;
DWORD cbRead;
- BOOL ret;
+ BOOL ret = FALSE;
static const WCHAR null[] = {0};
static const WCHAR toc_extW[] = {'h','h','c',0};
@@ -357,8 +357,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
pszJump2 = ConvertChmString(info, &wintype.pszJump2);
pszUrlJump1 = ConvertChmString(info, &wintype.pszUrlJump1);
pszUrlJump2 = ConvertChmString(info, &wintype.pszUrlJump2);
-
- ret = SUCCEEDED(hr);
}
else
{
@@ -378,7 +376,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
wintype.dwExStyles = 0;
wintype.nShowState = SW_SHOW;
wintype.curNavType = HHWIN_NAVTYPE_TOC;
- ret = TRUE;
}
/* merge the new data with any pre-existing HH_WINTYPE structure */
@@ -400,6 +397,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
heap_free(pszJump2);
heap_free(pszUrlJump1);
heap_free(pszUrlJump2);
+ ret = TRUE;
done:
if (pStream)
More information about the wine-cvs
mailing list