[gtk+] GtkGrid: gtk_grid_get_size_for_size() do not dereference a NULL pointer.
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkGrid: gtk_grid_get_size_for_size() do not dereference a NULL pointer.
- Date: Thu, 1 May 2014 22:55:55 +0000 (UTC)
commit 018c394c5200ef468d6bb721aa6b467d9fdffd50
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Thu May 1 19:54:10 2014 -0300
GtkGrid: gtk_grid_get_size_for_size() do not dereference a NULL pointer.
gtk/gtkgrid.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 69d29f4..5c93571 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1459,7 +1459,7 @@ gtk_grid_get_size_for_size (GtkGrid *grid,
{
GtkGridRequest request;
GtkGridLines *lines;
- gint min_size;
+ gint min_size, nat_size;
if (minimum)
*minimum = 0;
@@ -1486,7 +1486,7 @@ gtk_grid_get_size_for_size (GtkGrid *grid,
memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine));
gtk_grid_request_run (&request, 1 - orientation, FALSE);
- gtk_grid_request_sum (&request, 1 - orientation, &min_size, NULL, NULL, NULL);
+ gtk_grid_request_sum (&request, 1 - orientation, &min_size, &nat_size, NULL, NULL);
gtk_grid_request_allocate (&request, 1 - orientation, MAX (size, min_size));
gtk_grid_request_run (&request, orientation, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]