Changeset 247 for trunk/src/slib.c

Timestamp:

Sep 17, 2009, 10:22:48 PM (15 years ago)

Author:

katerina

Message:

Fix a race condition that might have caused ticket #163.

File:

• trunk/src/slib.c (modified) (6 diffs)

trunk/src/slib.c

@@ -1674 +1674 @@
   if ( (ofiles[fd]->path = (char *) malloc(len) ) == NULL)
     {
-      free(ofiles[fd]);
+      free (ofiles[fd]);
       ofiles[fd] = NULL;
       SL_IRETURN(SL_EMEM, _("sl_make_ticket"));
@@ -1687 +1687 @@
       (void) free (ofiles[fd]->path);
       (void) free (ofiles[fd]);
+      ofiles[fd] = NULL;
       SL_IRETURN(ticket, _("sl_make_ticket"));
     }
@@ -1935 +1936 @@
   if ( (ofiles[fd]->path = (char *) malloc(len) ) == NULL)
     {
-      free(ofiles[fd]);
+      free (ofiles[fd]);
       ofiles[fd] = NULL;
       close(fd);
@@ -1949 +1950 @@
       (void) free (ofiles[fd]->path);
       (void) free (ofiles[fd]);
+      ofiles[fd] = NULL;
       close(fd);
       SL_IRETURN(ticket, _("sl_open_file"));
@@ -2209 +2211 @@
     SL_IRETURN(fd, _("sl_close"));
 
+  if (ofiles[fd] != NULL)
+    {
 #if defined(HAVE_POSIX_FADVISE) && defined(HAVE_MINCORE) && defined(POSIX_FADV_DONTNEED)
-
-  if (ofiles[fd]->flush == SL_TRUE)
-    {
-      posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
-    }
-
-#endif
+      if (ofiles[fd]->flush == SL_TRUE)
+        {
+          posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
+        }
+#endif
+      if (ofiles[fd]->content)
+        sh_string_destroy(&(ofiles[fd]->content));
+      (void) free (ofiles[fd]->path);
+      (void) free (ofiles[fd]);
+      ofiles[fd] = NULL;
+    }
 
   /* This may fail, but what to do then ?
    */
-  if (0 != close(fd) && ofiles[fd] != NULL)
+  if (0 != close(fd))
     {
       TPT((0, FIL__, __LINE__, 
-           _("msg=<Error closing file.>, path=<%s>, fd=<%d>, err=<%s>\n"), 
-           ofiles[fd]->path, fd, strerror(errno)));
-    }
-
-  if (ofiles[fd] != NULL)
-    {
-      if (ofiles[fd]->content)
-        sh_string_destroy(&(ofiles[fd]->content));
-      (void) free(ofiles[fd]->path);
-      (void) free(ofiles[fd]);
-      ofiles[fd] = NULL;
+           _("msg=<Error closing file.>, fd=<%d>, err=<%s>\n"), 
+           fd, strerror(errno)));
     }
 
@@ -2248 +2247 @@
             sh_string_destroy(&(ofiles[fd]->content));
           if (ofiles[fd]->path != NULL)
-            (void) free(ofiles[fd]->path);
-          (void) free(ofiles[fd]);
+            (void) free (ofiles[fd]->path);
+          (void) free (ofiles[fd]);
           ofiles[fd] = NULL;
         }