Import CUPS 1.4svn-r7226.

[thirdparty/cups.git] / scheduler / mime.c

diff --git a/scheduler/mime.c b/scheduler/mime.c
index 6edaa4a663742905f00545f284492f0637985834..cee81209e9102cc8d3678c68e148a2d804f07ae0 100644 (file)
--- a/scheduler/mime.c
+++ b/scheduler/mime.c
@@ -3,7 +3,7 @@
  *
  *   MIME database file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -235,7 +235,10 @@ mimeMerge(mime_t     *mime,                /* I - MIME database to add to */
   if (!mime)
     mime = mimeNew();
   if (!mime)
+  {
+    cupsDirClose(dir);
     return (NULL);
+  }
 
  /*
   * Read all the .types files...