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

Bug 555587 – PSD file crashes PSD plug-in 

* plug-ins/file-psd/psd-load.c (add_merged_image): Handle
img_a->alpha_names being NULL.

svn path=/trunk/; revision=27181
This commit is contained in:
Martin Nordholts 2008-10-08 19:59:36 +00:00
parent 898ada7091
commit c7a49fdeb1
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-10-08 Martin Nordholts <martinn@svn.gnome.org>
Bug 555587 – PSD file crashes PSD plug-in
* plug-ins/file-psd/psd-load.c (add_merged_image): Handle
img_a->alpha_names being NULL.
2008-10-08 Michael Natterer <mitch@gimp.org> 2008-10-08 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpruler.c: cosmetics. * libgimpwidgets/gimpruler.c: cosmetics.

10
plug-ins/file-psd/psd-load.c
View File

@ -1557,10 +1557,14 @@ add_merged_image (const gint32 image_id,
if (img_a->transparency) if (img_a->transparency)
{ {
offset = 1; offset = 1;
/* Free "Transparency" channel name */ /* Free "Transparency" channel name */
alpha_name = g_ptr_array_index (img_a->alpha_names, 0); if (img_a->alpha_names)
if (alpha_name) {
g_free (alpha_name); alpha_name = g_ptr_array_index (img_a->alpha_names, 0);
if (alpha_name)
g_free (alpha_name);
}
} }
else else
offset = 0; offset = 0;