AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juan Pablo Ugarte 2014-05-01 19:54:10 -03:00
parent 49fa04212b
commit 018c394c52
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkgrid.c
View File

@ -1459,7 +1459,7 @@ gtk_grid_get_size_for_size (GtkGrid *grid,
{ {
GtkGridRequest request; GtkGridRequest request;
GtkGridLines *lines; GtkGridLines *lines;
gint min_size; gint min_size, nat_size;
if (minimum) if (minimum)
*minimum = 0; *minimum = 0;
@ -1486,7 +1486,7 @@ gtk_grid_get_size_for_size (GtkGrid *grid,
memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine)); memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine));
gtk_grid_request_run (&request, 1 - orientation, FALSE); 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_allocate (&request, 1 - orientation, MAX (size, min_size));
gtk_grid_request_run (&request, orientation, TRUE); gtk_grid_request_run (&request, orientation, TRUE);