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

plug-ins: fix #7408 metadata-editor plugin cashing when saving metadata

Browse Source 
When writing metadata in the metadata-editor it did not check for empty
values. In combination with gexiv2 0.14.0 (which doesn't check in this
specific case for an empty list of gchar **) and trying to set a non
repeatable Iptc tag (Iptc.Application2.Headline) using
gexiv2_metadata_set_tag_multiple we get a crash.

This fix checks first for a non empty value before trying to save the
metadata tag.
Since the code is very similar also implemented this check for the Xmp
tags in addition to the Iptc and simplified some duplicate code.

(cherry picked from commit 6eba73e714)
This commit is contained in:
Jacob Boerema
2021-10-24 13:38:06 -04:00
parent 3ed924d731
commit a9867d020a
1 changed files with 62 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
plug-ins/metadata/metadata-editor.c
View File

@ -4269,77 +4269,84 @@ metadata_editor_write_callback (GtkWidget *dialog,
text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE); text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
if (default_metadata_tags[i].xmp_type == GIMP_XMP_TEXT || gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
default_metadata_tags[i].xmp_type == GIMP_XMP_NONE) default_metadata_tags[i].tag);
if (text && *text)
{ {
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata), if (default_metadata_tags[i].xmp_type == GIMP_XMP_TEXT ||
default_metadata_tags[i].tag); default_metadata_tags[i].xmp_type == GIMP_XMP_NONE)
gexiv2_metadata_set_xmp_tag_struct (GEXIV2_METADATA (g_metadata),
default_metadata_tags[i].tag,
GEXIV2_STRUCTURE_XA_NONE);
if (! gexiv2_metadata_set_tag_string (GEXIV2_METADATA (g_metadata),
default_metadata_tags[i].tag,
text))
{ {
set_tag_failed (default_metadata_tags[i].tag); gexiv2_metadata_set_xmp_tag_struct (GEXIV2_METADATA (g_metadata),
}
}
else
{
gchar **multi;
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
default_metadata_tags[i].tag);
/* We have one value per line. */
multi = g_strsplit (text, "\n", 0);
if (! gexiv2_metadata_set_tag_multiple (GEXIV2_METADATA (g_metadata),
default_metadata_tags[i].tag, default_metadata_tags[i].tag,
(const gchar **) multi)) GEXIV2_STRUCTURE_XA_NONE);
{ if (! gexiv2_metadata_set_tag_string (GEXIV2_METADATA (g_metadata),
set_tag_failed (default_metadata_tags[i].tag); default_metadata_tags[i].tag,
text))
{
set_tag_failed (default_metadata_tags[i].tag);
}
} }
else
{
gchar **multi;
g_strfreev (multi); gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
default_metadata_tags[i].tag);
/* We have one value per line. */
multi = g_strsplit (text, "\n", 0);
if (! gexiv2_metadata_set_tag_multiple (GEXIV2_METADATA (g_metadata),
default_metadata_tags[i].tag,
(const gchar **) multi))
{
set_tag_failed (default_metadata_tags[i].tag);
}
g_strfreev (multi);
}
} }
index = default_metadata_tags[i].other_tag_index; index = default_metadata_tags[i].other_tag_index;
if (index > -1) if (index > -1)
{ {
gchar **multi;
gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata), gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
equivalent_metadata_tags[index].tag); equivalent_metadata_tags[index].tag);
if (! strcmp ("multi", equivalent_metadata_tags[index].mode))
{
multi = g_strsplit (text, "\n", 0);
if (! gexiv2_metadata_set_tag_multiple (GEXIV2_METADATA (g_metadata),
equivalent_metadata_tags[index].tag,
(const gchar **) multi))
{
set_tag_failed (equivalent_metadata_tags[index].tag);
}
g_strfreev (multi); if (text && *text)
}
else if (! strcmp ("single", equivalent_metadata_tags[index].mode))
{ {
/* Convert from multiline to single line: keep the \n and just add the whole text. */ if (! strcmp ("multi", equivalent_metadata_tags[index].mode))
if (*text &&
! gexiv2_metadata_set_tag_string (GEXIV2_METADATA (g_metadata),
equivalent_metadata_tags[index].tag,
text))
{ {
set_tag_failed (equivalent_metadata_tags[index].tag); gchar **multi;
multi = g_strsplit (text, "\n", 0);
if (! gexiv2_metadata_set_tag_multiple (GEXIV2_METADATA (g_metadata),
equivalent_metadata_tags[index].tag,
(const gchar **) multi))
{
set_tag_failed (equivalent_metadata_tags[index].tag);
}
g_strfreev (multi);
}
else if (! strcmp ("single", equivalent_metadata_tags[index].mode))
{
/* Convert from multiline to single line: keep the \n and just add the whole text. */
if (! gexiv2_metadata_set_tag_string (GEXIV2_METADATA (g_metadata),
equivalent_metadata_tags[index].tag,
text))
{
set_tag_failed (equivalent_metadata_tags[index].tag);
}
}
else
{
g_warning ("Copying from multiline tag %s to %s tag %s not implemented!",
default_metadata_tags[i].tag,
equivalent_metadata_tags[index].mode,
equivalent_metadata_tags[index].tag);
} }
}
else
{
g_warning ("Copying from multiline tag %s to %s tag %s not implemented!",
default_metadata_tags[i].tag,
equivalent_metadata_tags[index].mode,
equivalent_metadata_tags[index].tag);
} }
} }