Changeset c41e5d

Timestamp:

08/14/09 17:24:25 (4 years ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'a231b56d57a69513303d0061f5fa3e3cd51c85c1')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

584bc7ac9274e05c390505771c23928e380be3fe

Parents:

31d7bbc3fd8488ac2af3379bcbcbbbec1d7c774f

git-author:

Micke Prag <micke.prag@telldus.se>2009-08-14 15:24:25+00:00

git-committer:

Micke Prag <micke.prag@telldus.se>2009-08-14 15:24:25+00:00

Message:

Fixed bug where the first call to RegEnumKeyEx() failed because the size parameter wasn't initialized.

File:

• telldus-core/driver/libtelldus-core/SettingsWinRegistry.cpp (modified) (2 diffs)

telldus-core/driver/libtelldus-core/SettingsWinRegistry.cpp

@@ -87 +87 @@
                 
                         char* Buff = new char[intMaxRegValueLength];
-                        DWORD size;
+                        DWORD size = intMaxRegValueLength;
                         if (RegEnumKeyEx(d->hk, intDeviceIndex, (LPSTR)Buff, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {
                                 intReturn = (int)_atoi64(Buff);
@@ -95 +95 @@
 
                         RegCloseKey(d->hk);
-                }
-                else{
+                } else {
                         throw std::exception(); //couldn't open reg key
                 }