Bug 826173 - Avoid calling close/fclose/unlink with uninitialized val…

…ues in the linker. r=nfroyd
mozilla · Jan 3, 2013 · 82e356b · 82e356b
1 parent 8862d96
commit 82e356b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mozglue/linker/Mappable.h b/mozglue/linker/Mappable.h
@@ -114,6 +114,8 @@ class MappableExtractFile: public MappableFile
   {
     static void release(char *value)
     {
+      if (!value)
+        return;
       unlink(value);
       mozilla::ScopedDeleteArrayTraits<char>::release(value);
     }

diff --git a/mozglue/linker/Utils.h b/mozglue/linker/Utils.h
@@ -86,7 +86,7 @@ struct AutoCloseFDTraits
 {
   typedef int type;
   static int empty() { return -1; }
-  static void release(int fd) { close(fd); }
+  static void release(int fd) { if (fd != -1) close(fd); }
 };
 typedef mozilla::Scoped<AutoCloseFDTraits> AutoCloseFD;
 
@@ -97,7 +97,7 @@ struct AutoCloseFILETraits
 {
   typedef FILE *type;
   static FILE *empty() { return NULL; }
-  static void release(FILE *f) { fclose(f); }
+  static void release(FILE *f) { if (f) fclose(f); }
 };
 typedef mozilla::Scoped<AutoCloseFILETraits> AutoCloseFILE;