Index: base/third_party/xdg_mime/xdgmime.c |
diff --git a/base/third_party/xdg_mime/xdgmime.c b/base/third_party/xdg_mime/xdgmime.c |
index c7b16bbca762f89aafa7a95e62d7ec0db4d96bf0..ffb56d9cadb475f3360893838819708007f9dd7d 100644 |
--- a/base/third_party/xdg_mime/xdgmime.c |
+++ b/base/third_party/xdg_mime/xdgmime.c |
@@ -558,13 +558,14 @@ xdg_mime_get_mime_type_for_file (const char *file_name, |
mime_type = _xdg_mime_magic_lookup_data (global_magic, data, bytes_read, NULL, |
mime_types, n); |
- free (data); |
fclose (file); |
- if (mime_type) |
- return mime_type; |
+ if (!mime_type) { |
Lei Zhang
2015/04/20 19:14:02
No need for braces. The rest of the code only use
gburanov
2015/04/22 14:21:55
Done.
|
+ mime_type = _xdg_binary_or_text_fallback(data, bytes_read); |
+ } |
- return _xdg_binary_or_text_fallback(data, bytes_read); |
+ free (data); |
+ return mime_type; |
} |
const char * |