procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 09:53:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

plug-ins: Fix reading/writing NULL clipping paths for PSD

Browse source 
Previously, we did not check if the clipping path name
was properly converted to ISO-8859-1 from UTF-8
before saving. g_convert can return NULL if it fails,
which means we wrote NULL (causing a crash on load).

To resolve, this patch adds a check if the clipping path
name is NULL on load, warns the user, and then
stops loading the clipping path resource.
On export, we fall back to ASCII instead if the conversion
to ISO-8859-1 fails.
This commit is contained in:
Alx Sa 2025-03-12 20:06:25 +00:00
parent 4497c906c1
commit 8fd1d229dc
2 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
plug-ins/file-psd/psd-export.c
View file

@ -1164,7 +1164,7 @@ save_paths (GOutputStream *output,
iter = g_list_next (iter), v++) iter = g_list_next (iter), v++)
{ {
GString *data; GString *data;
gchar *name, *nameend; gchar *name;
gsize len; gsize len;
gint lenpos; gint lenpos;
gchar pointrecord[26] = { 0, }; gchar pointrecord[26] = { 0, };
@ -1177,10 +1177,10 @@ save_paths (GOutputStream *output,
/* /*
* - use iso8859-1 if possible * - use iso8859-1 if possible
* - otherwise use UTF-8, prepended with \xef\xbb\xbf (Byte-Order-Mark) * - otherwise use ASCII
*/ */
name = gimp_item_get_name (iter->data); name = gimp_item_get_name (iter->data);
tmpname = g_convert (name, -1, "iso8859-1", "utf-8", NULL, &len, &err); tmpname = g_convert (name, -1, "ISO-8859-1", "UTF-8", NULL, &len, &err);
if (tmpname && err == NULL) if (tmpname && err == NULL)
{ {
@ -1190,17 +1190,15 @@ save_paths (GOutputStream *output,
} }
else else
{ {
/* conversion failed, we fall back to UTF-8 */ /* conversion failed, we fall back to ASCII */
len = g_utf8_strlen (name, 255 - 3); /* need three marker-bytes */ gchar *ascii_name = g_str_to_ascii (name, NULL);
nameend = g_utf8_offset_to_pointer (name, len); len = g_utf8_strlen (ascii_name, 255);
len = nameend - name; /* in bytes */
g_assert (len + 3 <= 255);
g_string_append_c (data, len + 3); g_string_append_c (data, (gchar) MIN (len, 255));
g_string_append_len (data, "\xEF\xBB\xBF", 3); /* Unicode 0xfeff */ g_string_append_len (data, ascii_name, MIN (len, 255));
g_string_append_len (data, name, len);
g_free (ascii_name);
if (tmpname) if (tmpname)
g_free (tmpname); g_free (tmpname);
} }
@ -1300,11 +1298,21 @@ save_clipping_path (GOutputStream *output,
g_string_append_c (data, id / 256); g_string_append_c (data, id / 256);
g_string_append_c (data, id % 256); g_string_append_c (data, id % 256);
tmpname = g_convert (path_name, -1, "iso8859-1", "utf-8", NULL, &len, &err); tmpname = g_convert (path_name, -1, "ISO-8859-1", "UTF-8", NULL, &len, &err);
if (err != NULL || tmpname == NULL)
{
/* conversion failed, we fall back to ASCII */
if (tmpname)
g_free (tmpname);
tmpname = g_str_to_ascii (path_name, NULL);
len = g_utf8_strlen (tmpname, 255);
}
g_string_append_len (data, "\x00\x00\x00\x00", 4); g_string_append_len (data, "\x00\x00\x00\x00", 4);
if ((len + 6 + 1) <= 255) if ((len + 6 + 1) <= 255)
g_string_append_len (data, "\x00", 1); g_string_append_len (data, "\x00", 1);
/* The number of bytes for the two values after the path name is 6 */
g_string_append_c (data, len + 6 + 1); g_string_append_c (data, len + 6 + 1);
g_string_append_c (data, (gchar) MIN (len, 255)); g_string_append_c (data, (gchar) MIN (len, 255));

5
plug-ins/file-psd/psd-image-res-load.c
View file

@ -1739,8 +1739,11 @@ load_resource_2999 (const PSDimageres *res_a,
gint32 write_len; gint32 write_len;
path_name = fread_pascal_string (&read_len, &write_len, 2, input, error); path_name = fread_pascal_string (&read_len, &write_len, 2, input, error);
if (*error) if (*error || ! path_name)
{
g_printerr ("psd-load: Unable to read clipping path name.");
return -1; return -1;
}
/* Convert from fixed to floating point */ /* Convert from fixed to floating point */
if (psd_read (input, &path_flatness_int, 2, error) < 2 || if (psd_read (input, &path_flatness_int, 2, error) < 2 ||