libgimp, plug-ins: use g_strfreev() to free PDB string arrays

This commit is contained in:
Michael Natterer 2012-11-27 21:16:26 +01:00
parent 67dda14e77
commit c77fc779db
9 changed files with 15 additions and 30 deletions

View file

@ -521,11 +521,9 @@ browser_search (GimpBrowser *browser,
gtk_list_store_set (dialog->store, &iter, gtk_list_store_set (dialog->store, &iter,
COLUMN_PROC_NAME, proc_list[i], COLUMN_PROC_NAME, proc_list[i],
-1); -1);
g_free (proc_list[i]);
} }
g_free (proc_list); g_strfreev (proc_list);
gtk_tree_view_columns_autosize (GTK_TREE_VIEW (dialog->tree_view)); gtk_tree_view_columns_autosize (GTK_TREE_VIEW (dialog->tree_view));

View file

@ -1127,18 +1127,12 @@ dicom_get_elements_list (gint32 image_ID)
gimp_parasite_free (parasite); gimp_parasite_free (parasite);
} }
} }
/* make sure we free each individual parasite name, in
* addition to the array of names
*/
g_free (parasites[i]);
} }
} }
/* cleanup the array of names */ /* cleanup the array of names */
if (parasites) g_strfreev (parasites);
{
g_free (parasites);
}
return elements; return elements;
} }

View file

@ -4726,6 +4726,8 @@ gradient_get_list (gint *num_gradients)
gradients[n++] = g_strdup (external_gradients[i]); gradients[n++] = g_strdup (external_gradients[i]);
} }
g_strfreev (external_gradients);
return gradients; return gradients;
} }

View file

@ -910,10 +910,9 @@ pygimp_gradients_get_list(PyObject *self, PyObject *args, PyObject *kwargs)
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
PyList_SetItem(ret, i, PyString_FromString(list[i])); PyList_SetItem(ret, i, PyString_FromString(list[i]));
g_free(list[i]);
} }
g_free(list); g_strfreev(list);
return ret; return ret;
} }
@ -1319,10 +1318,9 @@ pygimp_parasite_list(PyObject *self)
for (i = 0; i < num_parasites; i++) { for (i = 0; i < num_parasites; i++) {
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i])); PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
g_free(parasites[i]);
} }
g_free(parasites); g_strfreev(parasites);
return ret; return ret;
} }
@ -1473,10 +1471,9 @@ pygimp_fonts_get_list(PyObject *self, PyObject *args, PyObject *kwargs)
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
PyList_SetItem(ret, i, PyString_FromString(list[i])); PyList_SetItem(ret, i, PyString_FromString(list[i]));
g_free(list[i]);
} }
g_free(list); g_strfreev(list);
return ret; return ret;
} }

View file

@ -317,10 +317,9 @@ drw_parasite_list(PyGimpDrawable *self)
for (i = 0; i < num_parasites; i++) { for (i = 0; i < num_parasites; i++) {
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i])); PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
g_free(parasites[i]);
} }
g_free(parasites); g_strfreev(parasites);
return ret; return ret;
} }

View file

@ -736,10 +736,9 @@ img_parasite_list(PyGimpImage *self)
for (i = 0; i < num_parasites; i++) { for (i = 0; i < num_parasites; i++) {
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i])); PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
g_free(parasites[i]);
} }
g_free(parasites); g_strfreev(parasites);
return ret; return ret;
} }

View file

@ -637,7 +637,7 @@ pdb_query(PyGimpPDB *self, PyObject *args)
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
PyList_SetItem(ret, i, PyString_FromString(names[i])); PyList_SetItem(ret, i, PyString_FromString(names[i]));
g_free(names); g_strfreev(names);
return ret; return ret;
} }
@ -723,10 +723,9 @@ build_procedure_list(void)
*p = '_'; *p = '_';
} }
PyList_SetItem(ret, i, PyString_FromString(name)); PyList_SetItem(ret, i, PyString_FromString(name));
g_free(name);
} }
g_free(names); g_strfreev(names);
return ret; return ret;
} }

View file

@ -707,10 +707,9 @@ vectors_parasite_list(PyGimpVectors *self)
for (i = 0; i < num_parasites; i++) { for (i = 0; i < num_parasites; i++) {
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i])); PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
g_free(parasites[i]);
} }
g_free(parasites); g_strfreev(parasites);
return ret; return ret;
} }

View file

@ -566,11 +566,9 @@ ts_init_procedures (scheme *sc,
gimp_destroy_paramdefs (params, n_params); gimp_destroy_paramdefs (params, n_params);
gimp_destroy_paramdefs (return_vals, n_return_vals); gimp_destroy_paramdefs (return_vals, n_return_vals);
} }
g_free (proc_list[i]);
} }
g_free (proc_list); g_strfreev (proc_list);
} }
static gboolean static gboolean