Changeset e97c4a30 for util.c

Timestamp:

Feb 2, 2009, 1:17:44 PM (16 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

50e671c

Parents:

637d983

git-author:

Geoffrey Thomas <geofft@mit.edu> (02/02/09 13:03:09)

git-committer:

Geoffrey Thomas <geofft@mit.edu> (02/02/09 13:17:44)

Message:

util.c: Fix double-free from owl_zephyr_delsub.

Also fix general memory-handling incompetence, including a use-after-free and a
leak. There are probably still errors here; we should rewrite the whole
function as per the comment at the top.

Reported-by: Quentin Smith <quentin@mit.edu>
Signed-off-by: Geoffrey Thomas <geofft@mit.edu>

File:

• util.c (modified) (2 diffs)

util.c

@@ -641 +641 @@
       owl_function_error("Error opening file %s for writing", backupfilename);
       owl_free(backupfilename);
+      fclose(file);
       return;
     }
-    owl_free(backupfilename);
   }
 
@@ -682 +682 @@
     owl_function_error("WARNING: Error opening %s for writing.  Use %s to restore.", filename, backupfilename);
     owl_function_beep();
-    owl_free(line);
-    return;
-  }
-
-  fputs(text, file);
-  fclose(file);
+  } else {
+    fputs(text, file);
+    fclose(file);
+  }
+
+  if (backup)
+    owl_free(backupfilename);
+  owl_free(text);
 }