Changeset 18380fd

Timestamp:

May 5, 2014, 6:44:00 AM (10 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10

Children:

94b9ee0

Parents:

b61ad80

git-author:

Anders Kaseorg <andersk@mit.edu> (04/23/14 02:55:30)

git-committer:

Anders Kaseorg <andersk@mit.edu> (05/05/14 06:44:00)

Message:

owl_zephyr_load{subs,loginsubs}: Eliminate useless stat call

Placates Coverity Scan service, which detects a TOCTOU race between
stat and fopen.  This race was in fact hiding an unlikely memory leak.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• zephyr.c (modified) (5 diffs)

zephyr.c

@@ -283 +283 @@
 #ifdef HAVE_LIBZEPHYR
   FILE *file;
+  int fopen_errno;
   char *tmp, *start;
   char *buffer = NULL;
@@ -289 +290 @@
   int subSize = 1024;
   int count;
-  struct stat statbuff;
 
   subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
 
-  if (stat(subsfile, &statbuff) != 0) {
-    g_free(subsfile);
-    if (error_on_nofile == 1)
+  count = 0;
+  file = fopen(subsfile, "r");
+  fopen_errno = errno;
+  g_free(subsfile);
+  if (!file) {
+    if (error_on_nofile == 1 || fopen_errno != ENOENT)
       return -1;
     return 0;
   }
-
-  ZResetAuthentication();
-  count = 0;
-  file = fopen(subsfile, "r");
-  g_free(subsfile);
-  if (!file)
-    return -1;
 
   subs = g_new(ZSubscription_t, subSize);
@@ -348 +344 @@
     g_free(buffer);
 
+  ZResetAuthentication();
   return owl_zephyr_loadsubs_helper(subs, count);
 #else
@@ -412 +409 @@
   char *buffer = NULL;
   int count;
-  struct stat statbuff;
 
   subs = g_new(ZSubscription_t, numSubs);
   subsfile = owl_zephyr_dotfile(".anyone", filename);
 
-  if (stat(subsfile, &statbuff) == -1) {
-    g_free(subs);
-    g_free(subsfile);
-    return 0;
-  }
-
-  ZResetAuthentication();
   count = 0;
   file = fopen(subsfile, "r");
@@ -445 +434 @@
     fclose(file);
   } else {
+    g_free(subs);
     return 0;
   }
   g_free(buffer);
 
+  ZResetAuthentication();
   return owl_zephyr_loadsubs_helper(subs, count);
 #else