Attachment 80246 Details for Bug 65112 – Proposed fix

[patch] Proposed fix

0001-glcpp-Fix-post-decrement-underflow-in-loop-control-v.patch (text/plain), 1.18 KB, created by Carl Worth on 2013-06-03 19:53:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Worth

Created: 2013-06-03 19:53:03 UTC

Size: 1.18 KB

patch

obsolete

>From e8f578f0872ea1fb67c127cc75621f968b54315c Mon Sep 17 00:00:00 2001
>From: Carl Worth <cworth@cworth.org>
>Date: Mon, 3 Jun 2013 11:35:43 -0700
>Subject: [PATCH 1/2] glcpp: Fix post-decrement underflow in loop-control
> variable
>
>This loop-control condition with a post-decrement operator would lead to
>an underflow of collapsed_newlines. This in turn would cause a subsequent
>execution of the loop to labor inordinately trying to return the loop-control
>variable to a value of 0 again.
>
>Fix this by dis-intertwining the test and the decrement.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65112
>---
> src/glsl/glcpp/pp.c |    4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c
>index 789f7f9..7e1b6c6 100644
>--- a/src/glsl/glcpp/pp.c
>+++ b/src/glsl/glcpp/pp.c
>@@ -97,8 +97,10 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader)
> 			{
> 				ralloc_strncat(&clean, shader,
> 					       newline - shader + 1);
>-				while (collapsed_newlines--)
>+				while (collapsed_newlines) {
> 					ralloc_strcat(&clean, "\n");
>+					collapsed_newlines--;
>+				}
> 				shader = newline + 1;
> 				search_start = shader;
> 			}
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 65112: 80246

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.