dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp: deal with NULL arrays in _gimp_value_to_gp_param() 

How did this not crash even once before in my tests...
This commit is contained in:
Michael Natterer 2019-08-13 22:52:19 +02:00
parent 91ecb6317a
commit 35fb6ca716
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libgimp/gimpgpparams-body.c
View File

@ -517,30 +517,44 @@ _gimp_value_to_gp_param (const GValue *value,
{ {
GimpArray *array = g_value_get_boxed (value); GimpArray *array = g_value_get_boxed (value);
param->param_type = GP_PARAM_TYPE_ARRAY; if (array)
{
param->param_type = GP_PARAM_TYPE_ARRAY;
param->data.d_array.size = array->length; param->data.d_array.size = array->length;
if (full_copy) if (full_copy)
param->data.d_array.data = g_memdup (array->data, param->data.d_array.data = g_memdup (array->data,
array->length); array->length);
else
param->data.d_array.data = array->data;
}
else else
param->data.d_array.data = array->data; {
param->data.d_array.data = NULL;
}
} }
else if (GIMP_VALUE_HOLDS_STRING_ARRAY (value)) else if (GIMP_VALUE_HOLDS_STRING_ARRAY (value))
{ {
GimpArray *array = g_value_get_boxed (value); GimpArray *array = g_value_get_boxed (value);
param->param_type = GP_PARAM_TYPE_STRING_ARRAY; if (array)
{
param->param_type = GP_PARAM_TYPE_STRING_ARRAY;
param->data.d_string_array.size = array->length; param->data.d_string_array.size = array->length;
if (full_copy) if (full_copy)
param->data.d_string_array.data = param->data.d_string_array.data =
gimp_value_dup_string_array (value); gimp_value_dup_string_array (value);
else
param->data.d_string_array.data =
(gchar **) gimp_value_get_string_array (value);
}
else else
param->data.d_string_array.data = {
(gchar **) gimp_value_get_string_array (value); param->data.d_string_array.data = NULL;
}
} }
else if (GIMP_VALUE_HOLDS_DISPLAY_ID (value) || else if (GIMP_VALUE_HOLDS_DISPLAY_ID (value) ||
GIMP_VALUE_HOLDS_IMAGE_ID (value) || GIMP_VALUE_HOLDS_IMAGE_ID (value) ||