Attachment 152154 Details for Bug 235480 – rb-shorter-duplicate-tags.patch

[patch] rb-shorter-duplicate-tags.patch

rb-shorter-duplicate-tags.patch (text/plain), 1.09 KB, created by Bastien Nocera on 2007-04-10 16:04:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bastien Nocera

Created: 2007-04-10 16:04:05 UTC

Size: 1.09 KB

patch

obsolete

>Index: rb-metadata-gst.c
>===================================================================
>--- rb-metadata-gst.c	(revision 5025)
>+++ rb-metadata-gst.c	(working copy)
>@@ -678,10 +678,12 @@
> 
> 	switch (type) {
> 	case G_TYPE_STRING: {
>-		/* Reject invalid utf-8 strings, and then
>-		 * remove leading and trailing whitespace.
>+		/* Reject invalid utf-8 strings, shorter duplicated tags
>+		 * and then remove leading and trailing whitespace.
> 		 */
> 		char *str;
>+		const char *old_str;
>+
> 		str = g_value_dup_string (newval);
> 
> 		if (!g_utf8_validate (str, -1, NULL)) {
>@@ -692,6 +694,20 @@
> 			return;
> 		}
> 		str = g_strstrip (str);
>+
>+		/* Check whether we have a shorter duplicate tag,
>+		 * Doesn't work with non-normalised UTF-8 strings */
>+		old_str = g_value_get_string (val);
>+		if (old_str != NULL
>+		    && g_utf8_strlen (old_str, -1) > g_utf8_strlen (str, -1)) {
>+			if (g_str_has_prefix (old_str, str) != FALSE) {
>+				rb_debug ("Got shorter duplicate tag");
>+				g_free (str);
>+				g_value_unset (newval);
>+				g_free (newval);
>+				return;
>+			}
>+		}
> 		g_value_take_string (newval, str);
> 		break;
> 	}

Actions: View | Diff

Attachments on bug 235480: 152154