diff options
| author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2014-05-01 19:54:10 -0300 |
|---|---|---|
| committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2014-05-01 19:54:43 -0300 |
| commit | 018c394c5200ef468d6bb721aa6b467d9fdffd50 (patch) | |
| tree | 025a93d4471e516478390d62b018bf7b06aafd5b | |
| parent | 49fa04212b644f19ce576a8011e3f4fcda6a0806 (diff) | |
| download | gtk+-018c394c5200ef468d6bb721aa6b467d9fdffd50.tar.gz | |
GtkGrid: gtk_grid_get_size_for_size() do not dereference a NULL pointer.
| -rw-r--r-- | gtk/gtkgrid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index 69d29f4fcc..5c93571ccf 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); |