Attachment 10695 Details for Bug 11569 – fix potential infinte loop in XawBoxQueryGeometry()

[patch] fix potential infinte loop in XawBoxQueryGeometry()

0001-fix-potential-infinte-loop-in-XawBoxQueryGeometry.patch (text/plain), 1.08 KB, created by Ademar Reis on 2007-07-12 10:29:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ademar Reis

Created: 2007-07-12 10:29:21 UTC

Size: 1.08 KB

patch

obsolete

>Date: Tue,  3 Jul 2007 17:20:52 -0300
>From: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
>Subject: [PATCH libXaw 1/1] fix potential infinte loop in XawBoxQueryGeometry()
>To: xorg@lists.freedesktop.org
>
>The problem is due to a short integer overflow when
>request_mode == CWHeight.
>
>Patch from Glenn Burkhardt <gbburkhardt@verizon.net>
>
>---
> src/Box.c |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/src/Box.c b/src/Box.c
>index f4f2939..f7b2069 100644
>--- a/src/Box.c
>+++ b/src/Box.c
>@@ -395,9 +395,10 @@ XawBoxQueryGeometry(Widget widget, XtWidgetGeometry *constraint,
> 	if (preferred_width <= constraint->width) {
> 	    width = preferred_width;
> 	    do { /* find some width big enough to stay within this height */
>-		width <<= 1;
>-		if (width > constraint->width)
>+		if (width > constraint->width >> 1) /* avoid short int overflow */
> 		    width = constraint->width;
>+		else
>+		    width <<= 1;
> 		DoLayout(w, width, 0, &preferred_width, &preferred_height, False);
> 	    } while (preferred_height > constraint->height
> 		     && width < constraint->width);
>-- 
>1.5.2.2

Actions: View | Splinter Review

Attachments on bug 11569: 10695

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.