X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fpidfile.c;h=dd6788a6539fea41ed1ce2790ab3446d795f5055;hp=08d96dfe6c02303000bcb1545d96cca793a144c2;hb=3e55dc77f4ba19fd9e79f3d5ce9d28bb6b05019e;hpb=45fca3c723302868de3225e7509d2292008948f7

diff --git a/lib/pidfile.c b/lib/pidfile.c
index 08d96dfe..dd6788a6 100644
--- a/lib/pidfile.c
+++ b/lib/pidfile.c
@@ -41,7 +41,8 @@ pid_t read_pid (char *pidfile)
 
   if (!(f=fopen(pidfile,"r")))
     return 0;
-  fscanf(f,"%ld", &pid);
+  if(fscanf(f,"%ld", &pid) != 1)
+    pid = 0;
   fclose(f);
   return pid;
 }
@@ -85,12 +86,11 @@ pid_t write_pid (char *pidfile)
   pid_t pid;
 
   if ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1) {
-      close(fd);
       return 0;
   }
 
   if ((f = fdopen(fd, "r+")) == NULL) {
-      fclose(f);
+      close(fd);
       return 0;
   }