Commit 51c6eb96 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Prevent overflow when storing size hints in an unsigned short variable.

2005-09-30  Matthias Clasen  <mclasen@redhat.com>

        * 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.
parent 56b4314a
2005-09-30 Matthias Clasen <mclasen@redhat.com>
* 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.
2005-09-29 Matthias Clasen <mclasen@redhat.com> 2005-09-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491, * gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491,
...@@ -310,7 +316,8 @@ Thu Sep 15 15:27:55 2005 Tim Janik <timj@imendio.com> ...@@ -310,7 +316,8 @@ Thu Sep 15 15:27:55 2005 Tim Janik <timj@imendio.com>
2005-09-14 Tristan Van Berkom <tvb@cvs.gnome.org> 2005-09-14 Tristan Van Berkom <tvb@cvs.gnome.org>
* gtk/gtkcolorbutton.c: Check "color" argument in gtk_color_button_set_color () * gtk/gtkcolorbutton.c: Check "color" argument in
gtk_color_button_set_color ()
2005-09-14 Matthias Clasen <mclasen@redhat.com> 2005-09-14 Matthias Clasen <mclasen@redhat.com>
......
2005-09-30 Matthias Clasen <mclasen@redhat.com>
* 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.
2005-09-29 Matthias Clasen <mclasen@redhat.com> 2005-09-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491, * gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491,
...@@ -310,7 +316,8 @@ Thu Sep 15 15:27:55 2005 Tim Janik <timj@imendio.com> ...@@ -310,7 +316,8 @@ Thu Sep 15 15:27:55 2005 Tim Janik <timj@imendio.com>
2005-09-14 Tristan Van Berkom <tvb@cvs.gnome.org> 2005-09-14 Tristan Van Berkom <tvb@cvs.gnome.org>
* gtk/gtkcolorbutton.c: Check "color" argument in gtk_color_button_set_color () * gtk/gtkcolorbutton.c: Check "color" argument in
gtk_color_button_set_color ()
2005-09-14 Matthias Clasen <mclasen@redhat.com> 2005-09-14 Matthias Clasen <mclasen@redhat.com>
......
...@@ -101,13 +101,13 @@ _gtk_socket_windowing_size_request (GtkSocket *socket) ...@@ -101,13 +101,13 @@ _gtk_socket_windowing_size_request (GtkSocket *socket)
{ {
if (hints.flags & PMinSize) if (hints.flags & PMinSize)
{ {
socket->request_width = hints.min_width; socket->request_width = MAX (hints.min_width, 1);
socket->request_height = hints.min_height; socket->request_height = MAX (hints.min_height, 1);
} }
else if (hints.flags & PBaseSize) else if (hints.flags & PBaseSize)
{ {
socket->request_width = hints.base_width; socket->request_width = MAX (hints.base_width, 1);
socket->request_height = hints.base_height; socket->request_height = MAX (hints.base_height, 1);
} }
} }
socket->have_size = TRUE; socket->have_size = TRUE;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment