jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fixed some memory-leaks.

Browse source
This commit is contained in:
Micke Prag 2009-10-09 15:37:54 +00:00
parent 668f745ac4
commit 3c7f56c709
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
telldus-core/driver/libtelldus-core/SettingsWinRegistry.cpp
View file

@ -41,7 +41,7 @@ Settings::~Settings(void)
//RegCloseKey(hk); //close all, if still open //TODO: Need some way to know if open or closed //RegCloseKey(hk); //close all, if still open //TODO: Need some way to know if open or closed
d->strRegPath = ""; d->strRegPath = "";
d->strRegPathDevice = ""; d->strRegPathDevice = "";
delete d;
} }
/* /*
@ -165,8 +165,8 @@ int Settings::getNextDeviceId() const {
long lngStatus = RegQueryValueEx(d->hk, "LastUsedId", NULL, NULL, (LPBYTE)Buff, &dwLength); long lngStatus = RegQueryValueEx(d->hk, "LastUsedId", NULL, NULL, (LPBYTE)Buff, &dwLength);
if(lngStatus == ERROR_MORE_DATA){ if(lngStatus == ERROR_MORE_DATA){
//The buffer is to small, recreate it
delete Buff;
Buff = new char[dwLength]; Buff = new char[dwLength];
lngStatus = RegQueryValueEx(d->hk, "LastUsedId", NULL, NULL, (LPBYTE)Buff, &dwLength); lngStatus = RegQueryValueEx(d->hk, "LastUsedId", NULL, NULL, (LPBYTE)Buff, &dwLength);
} }
@ -232,12 +232,15 @@ std::string Settings::getStringSetting(int intDeviceId, const std::string &name,
long lngStatus = RegQueryValueEx(d->hk, name.c_str(), NULL, NULL, (LPBYTE)Buff, &dwLength); long lngStatus = RegQueryValueEx(d->hk, name.c_str(), NULL, NULL, (LPBYTE)Buff, &dwLength);
if(lngStatus == ERROR_MORE_DATA){ if(lngStatus == ERROR_MORE_DATA){
//The buffer is to small, recreate it
delete Buff;
Buff = new char[dwLength]; Buff = new char[dwLength];
lngStatus = RegQueryValueEx(d->hk, name.c_str(), NULL, NULL, (LPBYTE)Buff, &dwLength); lngStatus = RegQueryValueEx(d->hk, name.c_str(), NULL, NULL, (LPBYTE)Buff, &dwLength);
} }
if (lngStatus == ERROR_SUCCESS) { if (lngStatus == ERROR_SUCCESS) {
strReturn = Buff; strReturn = Buff;
} }
delete Buff;
} }
else{ else{
throw std::exception(); //couldn't open reg key throw std::exception(); //couldn't open reg key
@ -319,9 +322,10 @@ bool storeGlobal(privateVars *d) {
long lngStatus = RegQueryValueEx(d->hk, "SharedDevices", NULL, NULL, (LPBYTE)Buff, &dwLength); long lngStatus = RegQueryValueEx(d->hk, "SharedDevices", NULL, NULL, (LPBYTE)Buff, &dwLength);
if(lngStatus == ERROR_MORE_DATA){ if(lngStatus == ERROR_MORE_DATA){
//The buffer is to small, recreate it
delete Buff;
Buff = new char[dwLength]; Buff = new char[dwLength];
lngStatus = RegQueryValueEx(d->hk, "SharedDevices", NULL, NULL, (LPBYTE)Buff, &dwLength); lngStatus = RegQueryValueEx(d->hk, "SharedDevices", NULL, NULL, (LPBYTE)Buff, &dwLength);
} }