ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix minor memory leak when querying Windows registry

Browse Source
This commit is contained in:
Robin Gareus 2021-10-11 18:19:46 +02:00
parent cf392f73fc
commit a2a36de98f
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libs/pbd/windows_special_dirs.cc
View File

@ -19,7 +19,6 @@
#include <shlobj.h> #include <shlobj.h>
#include <winreg.h> #include <winreg.h>
#include <shlobj.h>
#include <glibmm.h> #include <glibmm.h>
#include "pbd/windows_special_dirs.h" #include "pbd/windows_special_dirs.h"
@ -55,32 +54,35 @@ PBD::windows_query_registry (const char *regkey, const char *regval, std::string
DWORD size = PATH_MAX; DWORD size = PATH_MAX;
char tmp[PATH_MAX+1]; char tmp[PATH_MAX+1];
if ( (ERROR_SUCCESS == RegOpenKeyExA (root, regkey, 0, KEY_READ, &key)) if (ERROR_SUCCESS == RegOpenKeyExA (root, regkey, 0, KEY_READ, &key)) {
&& (ERROR_SUCCESS == RegQueryValueExA (key, regval, 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) if (ERROR_SUCCESS == RegQueryValueExA (key, regval, 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) {
) rv = Glib::locale_to_utf8 (tmp);
{ RegCloseKey (key);
rv = Glib::locale_to_utf8 (tmp); return true;
return true; }
RegCloseKey (key);
} }
if ( (ERROR_SUCCESS == RegOpenKeyExA (root, regkey, 0, KEY_READ | KEY_WOW64_32KEY, &key)) if (ERROR_SUCCESS == RegOpenKeyExA (root, regkey, 0, KEY_READ | KEY_WOW64_32KEY, &key)) {
&& (ERROR_SUCCESS == RegQueryValueExA (key, regval, 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) if (ERROR_SUCCESS == RegQueryValueExA (key, regval, 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) {
) rv = Glib::locale_to_utf8 (tmp);
{ RegCloseKey (key);
rv = Glib::locale_to_utf8 (tmp); return true;
return true; }
RegCloseKey (key);
} }
#ifndef _WIN64 #ifndef _WIN64
// If this is a 32-bit build (but we're running in Win64) the above // If this is a 32-bit build (but we're running in Win64) the above
// code will only search Win32 registry keys. So if we got this far // code will only search Win32 registry keys. So if we got this far
// without finding anything, force Windows to search Win64 keys too // without finding anything, force Windows to search Win64 keys too
if ( (ERROR_SUCCESS == RegOpenKeyExA (root, regkey, 0, KEY_READ | KEY_WOW64_64KEY, &key)) if (ERROR_SUCCESS == RegOpenKeyExA (root, regkey, 0, KEY_READ | KEY_WOW64_64KEY, &key)) {
&& (ERROR_SUCCESS == RegQueryValueExA (key, regval, 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) if (ERROR_SUCCESS == RegQueryValueExA (key, regval, 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) {
) rv = Glib::locale_to_utf8 (tmp);
{ RegCloseKey (key);
rv = Glib::locale_to_utf8 (tmp); return true;
return true; }
RegCloseKey (key);
} }
#endif #endif