1214. [bug] Win32: isc_file_renameunique() could leave zero length

                        files behind.

diff --git a/CHANGES b/CHANGES
index c086a54fe2911c2ae5e8429c8047acccf7415c07..9595828e742c7d7d47e83f09c2ca707c49c7a068 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+1214.  [bug]           Win32: isc_file_renameunique() could leave zero length
+                       files behind.
+
+1213.  [func]          Report view associated with client if it is not a
+                       standard view (_default or _bind).
+
 1212.  [port]          libbind: 64k answer buffers were causing stack space
                        to be exceeded for certian OS.  Use heap space instead.
 

diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 4cdb3a4491f5398fdde51a1e29f88152199926c2..38c9692611851659b1e8fe0302c9a714067a2aab 100644 (file)
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.c,v 1.27 2001/10/01 20:58:51 gson Exp $ */
+/* $Id: file.c,v 1.28 2002/02/28 00:23:34 marka Exp $ */
 
 #include <config.h>
 
@@ -301,6 +301,8 @@ isc_file_renameunique(const char *file, char *templet) {
        fd = mkstemp(templet);
        if (fd == -1)
                result = isc__errno2result(errno);
+       else
+               close(fd);
 
        if (result == ISC_R_SUCCESS) {
                res = isc_file_safemovefile(file, templet);
@@ -309,8 +311,6 @@ isc_file_renameunique(const char *file, char *templet) {
                        (void)unlink(templet);
                }
        }
-       if (fd != -1)
-               close(fd);
        return (result);
 }