callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins: fix resource leaks detected by coverity

Browse Source 
Several resource leaks here were detected by coverity:
- Not freeing value_utf.
- Strings returned by g_strconcat should be g_free'd. To handle the string
concatenations easier we use GString and g_string_append instead.
Also introduce function get_list_elements to reduce the number of
repetetive elements.
While we were at it, also remove unused includes.

(cherry picked from commit e90f041ca5)
This commit is contained in:
Jacob Boerema
2021-10-24 22:01:16 -04:00
parent a9867d020a
commit 9cfaf37c75
1 changed files with 59 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
plug-ins/metadata/metadata-xml.c
View File

@ -20,16 +20,8 @@
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <ctype.h>
#include <gegl.h>
#include <gtk/gtk.h>
#include <gexiv2/gexiv2.h> #include <gexiv2/gexiv2.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <libgimp/gimp.h> #include <libgimp/gimp.h>
#include <libgimp/gimpui.h> #include <libgimp/gimpui.h>
@ -59,6 +51,11 @@ gint row_count = 0;
gint item_count = 0; gint item_count = 0;
static void get_list_elements (GString *xmldata,
int element_count,
gchar **rowtagdata);
void void
xml_parser_start_element (GMarkupParseContext *context, xml_parser_start_element (GMarkupParseContext *context,
const gchar *element_name, const gchar *element_name,
@ -168,35 +165,40 @@ set_tag_ui (metadata_editor *args,
gchar* mode) gchar* mode)
{ {
GtkWidget *widget; GtkWidget *widget;
gchar *value_utf;
widget = GTK_WIDGET (gtk_builder_get_object (args->builder, str_tag_name)); widget = GTK_WIDGET (gtk_builder_get_object (args->builder, str_tag_name));
if (!strcmp ("single", mode)) if (!strcmp ("single", mode))
{ {
GtkEntry *entry_widget; GtkEntry *entry_widget;
gchar *value_utf;
value_utf = g_locale_to_utf8 (str_tag_value, -1, NULL, NULL, NULL); value_utf = g_locale_to_utf8 (str_tag_value, -1, NULL, NULL, NULL);
entry_widget = GTK_ENTRY (widget); entry_widget = GTK_ENTRY (widget);
gtk_entry_set_text (entry_widget, value_utf); gtk_entry_set_text (entry_widget, value_utf);
g_free (value_utf);
} }
else if (!strcmp ("multi", mode)) else if (!strcmp ("multi", mode))
{ {
GtkTextView *text_view; GtkTextView *text_view;
GtkTextBuffer *buffer; GtkTextBuffer *buffer;
gchar *value_utf;
value_utf = g_locale_to_utf8 (str_tag_value, -1, NULL, NULL, NULL); value_utf = g_locale_to_utf8 (str_tag_value, -1, NULL, NULL, NULL);
text_view = GTK_TEXT_VIEW (widget); text_view = GTK_TEXT_VIEW (widget);
buffer = gtk_text_view_get_buffer (text_view); buffer = gtk_text_view_get_buffer (text_view);
gtk_text_buffer_set_text (buffer, value_utf, -1); gtk_text_buffer_set_text (buffer, value_utf, -1);
g_free (value_utf);
} }
else if (!strcmp ("combo", mode)) else if (!strcmp ("combo", mode))
{ {
gint32 value; gint32 value;
gchar *value_utf;
value_utf = g_locale_to_utf8 (str_tag_value, -1, NULL, NULL, NULL); value_utf = g_locale_to_utf8 (str_tag_value, -1, NULL, NULL, NULL);
value = atoi(value_utf); value = atoi(value_utf);
gtk_combo_box_set_active (GTK_COMBO_BOX(widget), value); gtk_combo_box_set_active (GTK_COMBO_BOX(widget), value);
g_free (value_utf);
} }
else if (!strcmp ("list", mode)) else if (!strcmp ("list", mode))
{ {
@ -576,6 +578,27 @@ get_tag_ui_text (metadata_editor *args,
return NULL; return NULL;
} }
static void
get_list_elements (GString *xmldata, int element_count, gchar **rowtagdata)
{
gint list_idx;
g_string_append (xmldata, "\t\t\t<list-element>\n");
for (list_idx = 0; list_idx < element_count; list_idx++)
{
g_string_append (xmldata, "\t\t\t\t<element>");
if (rowtagdata && rowtagdata[list_idx] && strlen(rowtagdata[list_idx]) > 0)
{
g_string_append (xmldata, rowtagdata[list_idx]);
}
g_string_append (xmldata, "</element>\n");
}
g_string_append (xmldata, "\t\t\t</list-element>\n");
}
gchar * gchar *
get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode) get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
{ {
@ -584,14 +607,15 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
GtkTreeModel *treemodel; GtkTreeModel *treemodel;
GtkListStore *liststore; GtkListStore *liststore;
GtkTreeIter iter; GtkTreeIter iter;
gchar *xmldata; GString *xmldata;
gint number_of_rows; gint number_of_rows;
gint row; gint row;
gint has_data; gint has_data;
gchar *tagdata[256][256]; gchar *tagdata[256][256];
has_data = FALSE; has_data = FALSE;
xmldata = (gchar*)g_malloc(262144); xmldata = g_string_new ("");
object = gtk_builder_get_object (args->builder, name); object = gtk_builder_get_object (args->builder, name);
widget = GTK_WIDGET(object); widget = GTK_WIDGET(object);
@ -626,18 +650,10 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
(tagdata[row][6] != NULL && strlen(tagdata[row][6]) > 0) || (tagdata[row][6] != NULL && strlen(tagdata[row][6]) > 0) ||
(tagdata[row][7] != NULL && strlen(tagdata[row][7]) > 0)) (tagdata[row][7] != NULL && strlen(tagdata[row][7]) > 0))
{ {
gint types;
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 8, tagdata[row]);
for (types = 0; types < 8; types++)
{
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][types], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
}
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
else if (!strcmp (COPYRIGHTOWNER_HEADER, name)) else if (!strcmp (COPYRIGHTOWNER_HEADER, name))
@ -652,14 +668,14 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
{ {
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); g_string_append (xmldata, "\t\t\t<list-element>\n");
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL); g_string_append (xmldata, "\t\t\t\t<element>");
xmldata = g_strconcat (xmldata, tagdata[row][0], NULL); g_string_append (xmldata, tagdata[row][0]);
xmldata = g_strconcat (xmldata, "</element>\n", NULL); g_string_append (xmldata, "</element>\n");
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL); g_string_append (xmldata, "\t\t\t\t<element>");
xmldata = g_strconcat (xmldata, tagdata[row][1], NULL); g_string_append (xmldata, tagdata[row][1]);
xmldata = g_strconcat (xmldata, "</element>\n", NULL); g_string_append (xmldata, "</element>\n");
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL); g_string_append (xmldata, "\t\t\t</list-element>\n");
} }
} }
else if (!strcmp (IMAGECREATOR_HEADER, name)) else if (!strcmp (IMAGECREATOR_HEADER, name))
@ -672,18 +688,9 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
if ((tagdata[row][0] != NULL && strlen(tagdata[row][0]) > 0) || if ((tagdata[row][0] != NULL && strlen(tagdata[row][0]) > 0) ||
(tagdata[row][1] != NULL && strlen(tagdata[row][1]) > 0)) (tagdata[row][1] != NULL && strlen(tagdata[row][1]) > 0))
{ {
gint types;
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 2, tagdata[row]);
for (types = 0; types < 2; types++)
{
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][types], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
}
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
else if (!strcmp (ARTWORKOROBJECT_HEADER, name)) else if (!strcmp (ARTWORKOROBJECT_HEADER, name))
@ -704,18 +711,9 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
(tagdata[row][4] != NULL && strlen(tagdata[row][4]) > 0) || (tagdata[row][4] != NULL && strlen(tagdata[row][4]) > 0) ||
(tagdata[row][5] != NULL && strlen(tagdata[row][5]) > 0)) (tagdata[row][5] != NULL && strlen(tagdata[row][5]) > 0))
{ {
gint types;
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 6, tagdata[row]);
for (types = 0; types < 6; types++)
{
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][types], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
}
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
else if (!strcmp (REGISTRYID_HEADER, name)) else if (!strcmp (REGISTRYID_HEADER, name))
@ -728,18 +726,9 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
if ((tagdata[row][0] != NULL && strlen(tagdata[row][0]) > 0) || if ((tagdata[row][0] != NULL && strlen(tagdata[row][0]) > 0) ||
(tagdata[row][1] != NULL && strlen(tagdata[row][1]) > 0)) (tagdata[row][1] != NULL && strlen(tagdata[row][1]) > 0))
{ {
gint types;
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 2, tagdata[row]);
for (types = 0; types < 2; types++)
{
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][types], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
}
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
else if (!strcmp (LOCATIONSHOWN_HEADER, name)) else if (!strcmp (LOCATIONSHOWN_HEADER, name))
@ -760,18 +749,9 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
(tagdata[row][4] != NULL && strlen(tagdata[row][4]) > 0) || (tagdata[row][4] != NULL && strlen(tagdata[row][4]) > 0) ||
(tagdata[row][5] != NULL && strlen(tagdata[row][5]) > 0)) (tagdata[row][5] != NULL && strlen(tagdata[row][5]) > 0))
{ {
gint types;
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 6, tagdata[row]);
for (types = 0; types < 6; types++)
{
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][types], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
}
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
else if (!strcmp ("Xmp.iptcExt.OrganisationInImageName", name)) else if (!strcmp ("Xmp.iptcExt.OrganisationInImageName", name))
@ -784,11 +764,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
{ {
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 1, tagdata[row]);
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][0], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
else if (!strcmp ("Xmp.iptcExt.OrganisationInImageCode", name)) else if (!strcmp ("Xmp.iptcExt.OrganisationInImageCode", name))
@ -801,11 +777,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
{ {
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 1, tagdata[row]);
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][0], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
else if (!strcmp ("Xmp.plus.PropertyReleaseID", name)) else if (!strcmp ("Xmp.plus.PropertyReleaseID", name))
@ -818,11 +790,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
{ {
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 1, tagdata[row]);
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][0], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
else if (!strcmp ("Xmp.plus.ModelReleaseID", name)) else if (!strcmp ("Xmp.plus.ModelReleaseID", name))
@ -835,11 +803,7 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
{ {
has_data = TRUE; has_data = TRUE;
xmldata = g_strconcat (xmldata, "\t\t\t<list-element>\n", NULL); get_list_elements (xmldata, 1, tagdata[row]);
xmldata = g_strconcat (xmldata, "\t\t\t\t<element>", NULL);
xmldata = g_strconcat (xmldata, tagdata[row][0], NULL);
xmldata = g_strconcat (xmldata, "</element>\n", NULL);
xmldata = g_strconcat (xmldata, "\t\t\t</list-element>\n", NULL);
} }
} }
} }
@ -847,10 +811,14 @@ get_tag_ui_list (metadata_editor *args, gchar *name, gchar *mode)
if (has_data == TRUE) if (has_data == TRUE)
{ {
return xmldata; gchar *xml;
xml = g_strdup (xmldata->str);
g_string_free(xmldata, TRUE);
return xml;
} }
g_free(xmldata); g_string_free(xmldata, TRUE);
return NULL; return NULL;
} }