Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a crash and a leak in GetShortcutTarget() (closes bug 1541321)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-08-22 12:21:24 +00:00
parent 4f92e6ef06
commit cea0869cdf
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/filename.cpp
View File

@@ -1047,7 +1047,9 @@ bool wxFileName::Normalize(int flags,
#include <shlguid.h> #include <shlguid.h>
#endif #endif
bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targetFilename, wxString* arguments) bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
wxString& targetFilename,
wxString* arguments)
{ {
wxString path, file, ext; wxString path, file, ext;
wxSplitPath(shortcutPath, & path, & file, & ext); wxSplitPath(shortcutPath, & path, & file, & ext);
@@ -1076,6 +1078,8 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
MAX_PATH); MAX_PATH);
hres = ppf->Load(wsz, 0); hres = ppf->Load(wsz, 0);
ppf->Release();
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
{ {
wxChar buf[2048]; wxChar buf[2048];
@@ -1096,11 +1100,13 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
} }
} }
} }
psl->Release();
} }
psl->Release();
return success; return success;
} }
#endif
#endif // __WIN32__ && !__WXWINCE__
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------