Fix a freed memory read.

	* libdocument/ev-file-helpers.c: (get_mime_type_from_uri): Fix a freed
	memory read.

svn path=/trunk/; revision=3472

diff --git a/ChangeLog b/ChangeLog
index 10d80dce37d9b352f0452bdfa853baeca5501c23..ce1b602807b7d828b5ab0cc59d2f4a91c7ef45f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-16  Christian Persch  <chpe@gnome.org>
+
+       * libdocument/ev-file-helpers.c: (get_mime_type_from_uri): Fix a freed
+       memory read.
+
 2009-02-15  Christian Persch  <chpe@gnome.org>
 
        * backend/dvi/dvi-document.c: (hsb2rgb): Fix signed/unsigned compiler

diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c
index 7b9a9e9cfbe30ed4d8a468d402f9fb02ae2bf92b..67e884a4ee4e47959c135dc3bfb0a4dae7f10ba8 100644 (file)
--- a/libdocument/ev-file-helpers.c
+++ b/libdocument/ev-file-helpers.c
@@ -222,6 +222,7 @@ get_mime_type_from_uri (const gchar *uri, GError **error)
        GFile       *file;
        GFileInfo   *file_info;
        const gchar *content_type;
+        gchar       *mime_type = NULL;
 
        file = g_file_new_for_uri (uri);
        file_info = g_file_query_info (file,
@@ -233,12 +234,12 @@ get_mime_type_from_uri (const gchar *uri, GError **error)
                return NULL;
 
        content_type = g_file_info_get_content_type (file_info);
-       g_object_unref (file_info);
-
-       if (!content_type)
-               return NULL;
+       if (content_type) {
+                mime_type = g_content_type_get_mime_type (content_type);
+        }
 
-       return g_content_type_get_mime_type (content_type);
+       g_object_unref (file_info);
+       return mime_type;
 }
 
 static gchar *