diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-05-28 11:29:47 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-05-28 11:29:47 -0300 |
commit | fcb2d26cfa3b265200b5ae9e949d787a56bd4f14 (patch) | |
tree | 60bf5147d7608e6217b37e6807c386b3a43a2b36 /nonprism/grilo-plugins/local-metadata-crash.patch | |
parent | 19fe7e7da672746eea0c2cae0307cea5e54fb23e (diff) | |
parent | b0bb663657922f0154dd8d60a6d5455f9a2bfe3c (diff) |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'nonprism/grilo-plugins/local-metadata-crash.patch')
-rw-r--r-- | nonprism/grilo-plugins/local-metadata-crash.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/nonprism/grilo-plugins/local-metadata-crash.patch b/nonprism/grilo-plugins/local-metadata-crash.patch new file mode 100644 index 000000000..edc2b6dff --- /dev/null +++ b/nonprism/grilo-plugins/local-metadata-crash.patch @@ -0,0 +1,31 @@ +From 85fc7cbf831e914456623a2f7a9efbe81919bf4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com> +Date: Tue, 28 Apr 2015 19:46:54 -0400 +Subject: local-metadata: Ignore sanitization if the whole filename is + blacklisted + +If the whole filename ends up blacklisted, then just take it as-is. + +https://bugzilla.gnome.org/show_bug.cgi?id=748604 + +diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c +index adc81f0..45856be 100644 +--- a/src/local-metadata/grl-local-metadata.c ++++ b/src/local-metadata/grl-local-metadata.c +@@ -272,6 +272,13 @@ video_sanitise_string (const gchar *str) + if (*line_end != '\0') { + line_end = g_utf8_find_prev_char (line, line_end); + ++ ++ /* If everything in the string is blacklisted, just ignore ++ * the blackisting logic. ++ */ ++ if (line_end == NULL) ++ return g_strdup (str); ++ + /* After removing substring with blacklisted word, ignore non alpha-numeric + * char in the end of the sanitised string */ + while (g_unichar_isalnum (*line_end) == FALSE && +-- +cgit v0.10.2 + |