base/third_party/xdg_mime/free_pointer_later.patch - Issue 1124763003: Update from https://crrev.com/327068

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: base/third_party/xdg_mime/free_pointer_later.patch

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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:

OLD	NEW
(Empty)
	1 diff --git a/base/third_party/xdg_mime/xdgmime.c b/base/third_party/xdg_mime/xdg mime.c

	2 index c7b16bb..6dc58c2 100644

	3 --- a/base/third_party/xdg_mime/xdgmime.c

	4 +++ b/base/third_party/xdg_mime/xdgmime.c

	5 @@ -558,13 +558,13 @@ xdg_mime_get_mime_type_for_file (const char *file_name,

	6 mime_type = _xdg_mime_magic_lookup_data (global_magic, data, bytes_read, NULL ,

	7 mime_types, n);

	8

	9 - free (data);

	10 fclose (file);

	11

	12 - if (mime_type)

	13 - return mime_type;

	14 + if (!mime_type)

	15 + mime_type = _xdg_binary_or_text_fallback(data, bytes_read);

	16

	17 - return _xdg_binary_or_text_fallback(data, bytes_read);

	18 + free (data);

	19 + return mime_type;

	20 }

	21

	22 const char *

OLD	NEW