[Openvas-commits] r10560 - in trunk/openvas-scanner: . src

[scm-commit@wald.intevation.org]

Author: hdoreau
Date: 2011-03-16 09:56:04 +0100 (Wed, 16 Mar 2011)
New Revision: 10560

Modified:
   trunk/openvas-scanner/ChangeLog
   trunk/openvas-scanner/src/locks.c
   trunk/openvas-scanner/src/save_kb.c
Log:
* src/locks.c (file_lock, file_locked): Close file descriptors before
return.

* src/save_kb.c (save_kb_load_kb): Close stream before return.


Modified: trunk/openvas-scanner/ChangeLog
===================================================================
--- trunk/openvas-scanner/ChangeLog	2011-03-16 08:38:48 UTC (rev 10559)
+++ trunk/openvas-scanner/ChangeLog	2011-03-16 08:56:04 UTC (rev 10560)
@@ -1,3 +1,10 @@
+2011-03-16  Henri Doreau <henri.doreau at greenbone.net>
+
+	* src/locks.c (file_lock, file_locked): Close file descriptors before
+	return.
+
+	* src/save_kb.c (save_kb_load_kb): Close stream before return.
+
 2011-03-10  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	* tools/greenbone-nvt-sync: Fix conditionals so that they are

Modified: trunk/openvas-scanner/src/locks.c
===================================================================
--- trunk/openvas-scanner/src/locks.c	2011-03-16 08:38:48 UTC (rev 10559)
+++ trunk/openvas-scanner/src/locks.c	2011-03-16 08:56:04 UTC (rev 10560)
@@ -76,8 +76,10 @@
 
   bzero (buf, sizeof (buf));
   snprintf (buf, sizeof (buf), "%d", getpid ());
-  if (write (fd, buf, strlen (buf)) < 0)
+  if (write (fd, buf, strlen (buf)) < 0) {
+    close (fd);
     return -1;
+  }
   close (fd);
   return 0;
 }
@@ -120,6 +122,7 @@
       log_write ("Could not determine if the file %s is locked: Failed to read %s\n",
                  name, lock);
       efree (&lock);
+      close (fd);
       return 0;
     }
 

Modified: trunk/openvas-scanner/src/save_kb.c
===================================================================
--- trunk/openvas-scanner/src/save_kb.c	2011-03-16 08:38:48 UTC (rev 10559)
+++ trunk/openvas-scanner/src/save_kb.c	2011-03-16 08:56:04 UTC (rev 10560)
@@ -647,6 +647,7 @@
       log_write ("user %s : Could not read %s - kb won't be restored for %s\n",
                  (char *) arg_get_value (globals, "user"), fname, hostname);
       efree (&fname);
+      fclose (f);
       return NULL;
     }