Attachment 303917 Details for Bug 178698 – patch

[patch] patch

libuser-compat_memoryleak.patch (text/plain), 2.00 KB, created by ritz on 2008-04-27 15:01:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ritz

Created: 2008-04-27 15:01:12 UTC

Size: 2.00 KB

patch

obsolete

>--- libuser-0.52.5/lib/util.c 
>+++ libuser-0.53.7/lib/util.c 
>@@ -261,6 +261,7 @@
> 		contents = g_malloc(st.st_size);
> 		if (lseek(fd, 0, SEEK_SET) == -1) {
> 			lu_error_new(error, lu_error_read, NULL);
>+			g_free(contents);
> 			return NULL;
> 		}
> 		if (read(fd, contents, st.st_size) != st.st_size) {
>
>
>--- libuser-0.52.5.orig/modules/files.c	2008-04-27 18:44:56.000000000 +0530
>+++ libuser-0.52.5/modules/files.c	2008-04-27 20:10:46.000000000 +0530
>@@ -2093,7 +2093,8 @@
> 		if (p != NULL) {
> 			/* snip off the parts we don't care about, */
> 			*p = '\0';
>-			if (fnmatch(pattern, buf, 0) == 0) {
>+			if (buf[0] != '+' && buf[0] != '-' &&
>+				fnmatch(pattern, buf, 0) == 0) {
> 				/* add add it to the list we're returning. */
> 				g_value_set_string(&value, buf);
> 				g_value_array_append(ret, &value);
>@@ -2196,7 +2197,7 @@
> 
> 	/* Iterate over each line. */
> 	while ((buf = line_read(fp)) != NULL) {
>-		if (strlen(buf) == 1) {
>+		if (strlen(buf) == 1 || buf[0] == '+' || buf[0] == '-') {
> 			g_free(buf);
> 			continue;
> 		}
>@@ -2280,7 +2281,7 @@
> 
> 	/* Iterate over all of these lines as well. */
> 	while ((buf = line_read(fp)) != NULL) {
>-		if (strlen(buf) == 1) {
>+		if (strlen(buf) == 1 || buf[0] == '+' || buf[0] == '-') {
> 			g_free(buf);
> 			continue;
> 		}
>@@ -2401,7 +2402,7 @@
> 	/* Iterate through all of the lines in the file. */
> 	key = NULL;
> 	while ((buf = line_read(fp)) != NULL) {
>-		if (strlen(buf) == 1) {
>+		if (strlen(buf) == 1 || buf[0] == '+' || buf[0] == '-') {
> 			g_free(buf);
> 			continue;
> 		}
>@@ -2473,7 +2474,7 @@
> 
> 	/* Iterate through all of the lines in the file. */
> 	while ((buf = line_read(fp)) != NULL) {
>-		if (strlen(buf) == 1) {
>+		if (strlen(buf) == 1 || buf[0] == '+' || buf[0] == '-') {
> 			g_free(buf);
> 			continue;
> 		}
>@@ -2588,7 +2589,9 @@
> 	/* Allocate an array to hold results. */
> 	ret = g_ptr_array_new();
> 	while ((buf = line_read(fp)) != NULL) {
>-		if (strlen(buf) == 1) {
>+		struct lu_ent *ent;
>+
>+		if (strlen(buf) == 1 || buf[0] == '+' || buf[0] == '-') {
> 			g_free(buf);
> 			continue;
> 		}
>

Actions: View | Diff

Attachments on bug 178698: 303917