Apply patch from Scott Lamb fixing some memory and resource leaks.

[tinc] / lib / pidfile.c

diff --git a/lib/pidfile.c b/lib/pidfile.c
index 61a802f..08d96df 100644 (file)
--- a/lib/pidfile.c
+++ b/lib/pidfile.c
@@ -84,8 +84,13 @@ pid_t write_pid (char *pidfile)
   int fd;
   pid_t pid;
 
-  if ( ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1)
-       || ((f = fdopen(fd, "r+")) == NULL) ) {
+  if ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1) {
+      close(fd);
+      return 0;
+  }
+
+  if ((f = fdopen(fd, "r+")) == NULL) {
+      fclose(f);
       return 0;
   }
   
@@ -98,18 +103,18 @@ pid_t write_pid (char *pidfile)
 
   pid = getpid();
   if (!fprintf(f,"%ld\n", (long)pid)) {
-      close(fd);
+      fclose(f);
       return 0;
   }
   fflush(f);
 
 #ifdef HAVE_FLOCK
   if (flock(fd, LOCK_UN) == -1) {
-      close(fd);
+      fclose(f);
       return 0;
   }
 #endif
-  close(fd);
+  fclose(f);
 
   return pid;
 }