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

Issue #2685 - Crash when distributing layers horizontally

Browse Source 
Fix xcf-load.c to correct out-of-range item offsets (simply set them
to 0), so XCF files that are broken this way can still be recovered.

This doesn't fix the original bug, just recovering the crash images.

(cherry picked from commit b9265e7cde)
This commit is contained in:
Michael Natterer
2019-01-03 15:02:55 +01:00
parent 422486409a
commit 4572da5491
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/xcf/xcf-load.c
View File

@ -1174,11 +1174,27 @@ xcf_load_layer_props (XcfInfo *info,
case PROP_OFFSETS:
{
guint32 offset_x;
guint32 offset_y;
gint32 offset_x;
gint32 offset_y;
xcf_read_int32 (info, &offset_x, 1);
xcf_read_int32 (info, &offset_y, 1);
xcf_read_int32 (info, (guint32 *) &offset_x, 1);
xcf_read_int32 (info, (guint32 *) &offset_y, 1);
if (offset_x < -GIMP_MAX_IMAGE_SIZE ||
offset_x > GIMP_MAX_IMAGE_SIZE)
{
g_printerr ("unexpected item offset_x (%d) in XCF, "
"setting to 0\n", offset_x);
offset_x = 0;
}
if (offset_y < -GIMP_MAX_IMAGE_SIZE ||
offset_y > GIMP_MAX_IMAGE_SIZE)
{
g_printerr ("unexpected item offset_y (%d) in XCF, "
"setting to 0\n", offset_y);
offset_y = 0;
}
gimp_item_set_offset (GIMP_ITEM (*layer), offset_x, offset_y);
}