Commit 018c394c authored by Juan Pablo Ugarte's avatar Juan Pablo Ugarte

GtkGrid: gtk_grid_get_size_for_size() do not dereference a NULL pointer.

parent 49fa0421
......@@ -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);
......
Markdown is supported
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