2198. [bug] win32: RegCloseKey() could be called when

                        RegOpenKeyEx() failed. [RT #16911]

diff --git a/CHANGES b/CHANGES
index 16615e5de6aa0c29d1bd5cfe06382f08ae5ce771..2db02df30ceeb917cc6a407500c752841417314d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2198.  [bug]           win32: RegCloseKey() could be called when
+                       RegOpenKeyEx() failed. [RT #16911]
+
 2197.  [bug]           Add INSIST to catch negative responses which are
                        not setting the event result code appropriately.
                        [RT #16909]

diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c
index 5489e0aadd46097ce5b075cb7f1318ea94e3088a..0bb44f9e3fefd9a8c7be2d5e6e6d3cf4f419b1bf 100644 (file)
--- a/lib/isc/win32/ntpaths.c
+++ b/lib/isc/win32/ntpaths.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntpaths.c,v 1.6.2.3 2004/03/09 06:12:19 marka Exp $ */
+/* $Id: ntpaths.c,v 1.6.2.4 2007/06/18 03:04:58 marka Exp $ */
 
 /*
  * This module fetches the required path information that is specific
@@ -63,9 +63,8 @@ isc_ntpaths_init() {
                if (RegQueryValueEx(hKey, "InstallDir", NULL, NULL,
                        (LPBYTE)namedBase, &baseLen) != ERROR_SUCCESS)
                        keyFound = FALSE;
+               RegCloseKey(hKey);
        }
-       
-       RegCloseKey(hKey);
 
        GetSystemDirectory(systemDir, MAX_PATH);