From 51c6eb961e77ea871c54955c282b9c55a5e98b49 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 Sep 2005 14:57:02 +0000 Subject: Prevent overflow when storing size hints in an unsigned short variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2005-09-30 Matthias Clasen * gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request): Prevent overflow when storing size hints in an unsigned short variable. Tracked down by Ray Strode and Søren Sandmann. --- gtk/gtksocket-x11.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk/gtksocket-x11.c') diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c index 0470a7c896..9554d67ffc 100644 --- a/gtk/gtksocket-x11.c +++ b/gtk/gtksocket-x11.c @@ -101,13 +101,13 @@ _gtk_socket_windowing_size_request (GtkSocket *socket) { if (hints.flags & PMinSize) { - socket->request_width = hints.min_width; - socket->request_height = hints.min_height; + socket->request_width = MAX (hints.min_width, 1); + socket->request_height = MAX (hints.min_height, 1); } else if (hints.flags & PBaseSize) { - socket->request_width = hints.base_width; - socket->request_height = hints.base_height; + socket->request_width = MAX (hints.base_width, 1); + socket->request_height = MAX (hints.base_height, 1); } } socket->have_size = TRUE; -- cgit v1.2.1