Fix two memory leaks discovered with Valgrind.

* ftfont.c (ftfont_list) [HAVE_LIBOTF]: Call OTF_close.
* image.c (Fimagemagick_types): Call MagickRelinquishMemory.

diff --git a/src/ChangeLog b/src/ChangeLog
index a9822e56acd8afe2793bbb30c3827b7b904ae096..5d01b8e9f18353809b4e3ab95cc4616f2500fe17 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       Fix two memory leaks discovered with Valgrind.
+       * ftfont.c (ftfont_list) [HAVE_LIBOTF]: Call OTF_close.
+       * image.c (Fimagemagick_types): Call MagickRelinquishMemory.
+
 2014-01-22  Martin Rudalics  <rudalics@gmx.at>
 
        Fixes in window size functions around Bug#16430 and Bug#16470.

diff --git a/src/ftfont.c b/src/ftfont.c
index 384989732e1c2e1e24158c9ebc21045868baf9cb..112adad8a10dcf578e19447b57cff7d6d0eeb7be 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1011,6 +1011,7 @@ ftfont_list (struct frame *f, Lisp_Object spec)
       if (otspec)
        {
          FcChar8 *file;
+         bool passed;
          OTF *otf;
 
          if (FcPatternGetString (fontset->fonts[i], FC_FILE, 0, &file)
@@ -1019,14 +1020,16 @@ ftfont_list (struct frame *f, Lisp_Object spec)
          otf = OTF_open ((char *) file);
          if (! otf)
            continue;
-         if (OTF_check_features (otf, 1,
-                                 otspec->script_tag, otspec->langsys_tag,
-                                 otspec->features[0],
-                                 otspec->nfeatures[0]) != 1
-             || OTF_check_features (otf, 0,
-                                    otspec->script_tag, otspec->langsys_tag,
-                                    otspec->features[1],
-                                    otspec->nfeatures[1]) != 1)
+         passed = (OTF_check_features (otf, 1, otspec->script_tag,
+                                       otspec->langsys_tag,
+                                       otspec->features[0],
+                                       otspec->nfeatures[0]) == 1
+                   && OTF_check_features (otf, 0, otspec->script_tag,
+                                          otspec->langsys_tag,
+                                          otspec->features[1],
+                                          otspec->nfeatures[1]) == 1);
+         OTF_close (otf);
+         if (!passed)
            continue;
        }
 #endif /* HAVE_LIBOTF */

diff --git a/src/image.c b/src/image.c
index 63f97fe2effb09fd40d94ec66d6e940cbaf57bdd..e4f4c7ec21fa87b6fb11032a5e0ab93f914cf6fb 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -8546,7 +8546,10 @@ and `imagemagick-types-inhibit'.  */)
     {
       Qimagemagicktype = intern (imtypes[i]);
       typelist = Fcons (Qimagemagicktype, typelist);
+      imtypes[i] = (char *) MagickRelinquishMemory (imtypes[i]);
     }
+
+  imtypes = (char **) MagickRelinquishMemory (imtypes);
   return Fnreverse (typelist);
 }