Attachment 52193 Details for Bug 41660 – Coherent buffer size calculation and buffer use.

[patch] Coherent buffer size calculation and buffer use.

xmode-1.11a.diff (text/plain), 1.26 KB, created by vdb128 on 2011-10-10 11:10:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: vdb128

Created: 2011-10-10 11:10:55 UTC

Size: 1.26 KB

patch

obsolete

>Signed-off-by: Servaas Vandenberghe <vdb@picaros.org>
>diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
>index 1cff3bc..b188503 100644
>--- a/hw/xfree86/parser/scan.c
>+++ b/hw/xfree86/parser/scan.c
>@@ -1093,7 +1093,7 @@ char *
> xf86addComment(char *cur, char *add)
> {
> 	char *str;
>-	int len, curlen, iscomment, hasnewline = 0, endnewline;
>+	int len, curlen, iscomment, hasnewline = 0, insnewline, endnewline;
> 
> 	if (add == NULL || add[0] == '\0')
> 		return cur;
>@@ -1108,7 +1108,6 @@ xf86addComment(char *cur, char *add)
> 		curlen = 0;
> 
> 	str = add;
>-	iscomment = 0;
> 	while (*str) {
> 	    if (*str != ' ' && *str != '\t')
> 		break;
>@@ -1118,14 +1117,23 @@ xf86addComment(char *cur, char *add)
> 
> 	len = strlen(add);
> 	endnewline = add[len - 1] == '\n';
>-	len +=  1 + iscomment + (!hasnewline) + (!endnewline) + eol_seen;
> 
>-	if ((str = realloc(cur, len + curlen)) == NULL)
>+	insnewline = eol_seen || (curlen && !hasnewline);
>+	if (insnewline)
>+		len++;
>+	if (!iscomment)
>+		len++;
>+	if (!endnewline)
>+		len++;
>+
>+	/* Allocate + 1 char for '\0' terminator. */
>+	str = realloc(cur, curlen + len + 1);
>+	if (!str)
> 		return cur;
> 
> 	cur = str;
> 
>-	if (eol_seen || (curlen && !hasnewline))
>+	if (insnewline)
> 		cur[curlen++] = '\n';
> 	if (!iscomment)
> 		cur[curlen++] = '#';
>

Actions: View | Splinter Review

Attachments on bug 41660: 52193

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.