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

ChangeLog

+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>
 
 	* libgimpwidgets/gimpruler.c: cosmetics.

plug-ins/file-psd/psd-load.c

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