Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2468)

Unified Diff: base/third_party/xdg_mime/free_poiner_later.patch

Issue 1037023002: Do not free pointer when you are going to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code according to suggestions Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/third_party/xdg_mime/free_poiner_later.patch
diff --git a/base/third_party/xdg_mime/free_poiner_later.patch b/base/third_party/xdg_mime/free_poiner_later.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f4aaeffbcc2e21af7872da32583a550c97c3b92e
--- /dev/null
+++ b/base/third_party/xdg_mime/free_poiner_later.patch
@@ -0,0 +1,23 @@
+diff --git a/base/third_party/xdg_mime/xdgmime.c b/base/third_party/xdg_mime/xdgmime.c
+index c7b16bb..ffb56d9c 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) {
++ 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 *

Powered by Google App Engine
This is Rietveld 408576698