Attachment 315712 Details for Bug 461074 – patch based on upstream code

[patch] patch based on upstream code

libuser-field-format.patch (text/plain), 1.34 KB, created by ritz on 2008-09-04 00:58:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ritz

Created: 2008-09-04 00:58:41 UTC

Size: 1.34 KB

patch

obsolete

>--- libuser-0.52.5.orig/modules/files.c	2004-10-11 02:26:45.000000000 +0530
>+++ libuser-0.52.5/modules/files.c	2008-09-02 22:43:00.000000000 +0530
>@@ -322,21 +322,19 @@
> 	      size_t format_count, struct lu_ent *ent)
> {
> 	size_t i;
>-	int field, minimum = 1;
>+	int field;
> 	gchar **v = NULL;
> 	GValue value;
> 
> 	/* Make sure the line is properly formatted, meaning that it has enough
> 	 * fields in it for us to parse out all the fields we want, allowing for
> 	 * the last one to be empty. */
>-	for (i = 0; i < format_count; i++) {
>-		minimum = MAX(minimum, formats[i].position);
>-	}
>-	v = g_strsplit(line, ":", format_count);
>-	if (lu_strv_len(v) < (size_t)(minimum - 1)) {
>-		g_warning("entry is incorrectly formatted");
>-		return FALSE;
>-	}
>+        v = g_strsplit(line, ":", format_count);
>+        g_assert(format_count > 0);
>+        if (lu_strv_len(v) < format_count - 1) {
>+                g_warning("entry is incorrectly formatted");
>+                return FALSE;
>+        }
> 
> 	/* Now parse out the fields. */
> 	memset(&value, 0, sizeof(value));
>@@ -2605,8 +2603,7 @@
> 		}
> 		/* If the account name matches the pattern, parse it and add
> 		 * it to the list. */
>-		if (fnmatch(pattern, buf, 0) == 0) {
>-			parser(buf, ent);
>+		if (fnmatch(pattern, buf, 0) == 0 && parser(buf, ent) != FALSE) {
> 			g_ptr_array_add(ret, ent);
> 		} else {
> 			lu_ent_free(ent);

Actions: View | Diff

Attachments on bug 461074: 315712 | 315807