Attachment 148572 Details for Bug 229653 – Correctly free temporary buffer on return from e2p_edit_feature

[patch] Correctly free temporary buffer on return from e2p_edit_feature

e2fsprogs-1.35-edit_feature_leak.patch (text/plain), 992 bytes, created by Bryn M. Reeves on 2007-02-22 15:11:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2007-02-22 15:11:13 UTC

Size: 992 bytes

patch

obsolete

>
>Index: e2fsprogs-1.35/lib/e2p/feature.c
>===================================================================
>--- e2fsprogs-1.35.orig/lib/e2p/feature.c
>+++ e2fsprogs-1.35/lib/e2p/feature.c
>@@ -148,7 +148,7 @@ static char *skip_over_word(char *cp)
> int e2p_edit_feature(const char *str, __u32 *compat_array, __u32 *ok_array)
> {
> 	char	*cp, *buf, *next;
>-	int	neg;
>+	int	neg, rc = 0;
> 	unsigned int	mask;
> 	int		compat_type;
> 
>@@ -173,16 +173,22 @@ int e2p_edit_feature(const char *str, __
> 			cp++;
> 			break;
> 		}
>-		if (e2p_string2feature(cp, &compat_type, &mask))
>-			return 1;
>-		if (ok_array && !(ok_array[compat_type] & mask))
>-			return 1;
>+		if (e2p_string2feature(cp, &compat_type, &mask)){
>+			rc = 1;
>+			goto out;
>+		}
>+		if (ok_array && !(ok_array[compat_type] & mask)){
>+			rc = 1;
>+			goto out;
>+		}
> 		if (neg)
> 			compat_array[compat_type] &= ~mask;
> 		else
> 			compat_array[compat_type] |= mask;
> 		cp = next ? next+1 : 0;
> 	}
>-	return 0;
>+out:
>+	free(buf);
>+	return rc;
> }
>

Actions: View | Diff

Attachments on bug 229653: 148572