archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix wrong memory handling in own rB93633efe69ca.

Browse Source 
`BLO_library_read_struct()` actually takes care for us of nearly
everything, makes things much simpler...
This commit is contained in:
Bastien Montagne
2019-03-11 23:36:32 +01:00
parent cb14138b5a
commit 5ae8b1da02
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenloader/intern/readblenentry.c
View File

@@ -200,13 +200,9 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype, int *to
if (prv) { if (prv) {
memcpy(new_prv, prv, sizeof(PreviewImage)); memcpy(new_prv, prv, sizeof(PreviewImage));
if (prv->rect[0] && prv->w[0] && prv->h[0]) { if (prv->rect[0] && prv->w[0] && prv->h[0]) {
uint *rect = NULL;
size_t len = new_prv->w[0] * new_prv->h[0] * sizeof(uint);
new_prv->rect[0] = MEM_callocN(len, __func__);
bhead = blo_bhead_next(fd, bhead); bhead = blo_bhead_next(fd, bhead);
rect = BLO_library_read_struct(fd, bhead, "PreviewImage Icon Rect"); BLI_assert((new_prv->w[0] * new_prv->h[0] * sizeof(uint)) == bhead->len);
BLI_assert(len == bhead->len); new_prv->rect[0] = BLO_library_read_struct(fd, bhead, "PreviewImage Icon Rect");
memcpy(new_prv->rect[0], rect, len);
} }
else { else {
/* This should not be needed, but can happen in 'broken' .blend files, /* This should not be needed, but can happen in 'broken' .blend files,
@@ -217,13 +213,9 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype, int *to
} }
if (prv->rect[1] && prv->w[1] && prv->h[1]) { if (prv->rect[1] && prv->w[1] && prv->h[1]) {
uint *rect = NULL;
size_t len = new_prv->w[1] * new_prv->h[1] * sizeof(uint);
new_prv->rect[1] = MEM_callocN(len, __func__);
bhead = blo_bhead_next(fd, bhead); bhead = blo_bhead_next(fd, bhead);
rect = BLO_library_read_struct(fd, bhead, "PreviewImage Image Rect"); BLI_assert((new_prv->w[1] * new_prv->h[1] * sizeof(uint)) == bhead->len);
BLI_assert(len == bhead->len); new_prv->rect[1] = BLO_library_read_struct(fd, bhead, "PreviewImage Image Rect");
memcpy(new_prv->rect[1], rect, len);
} }
else { else {
/* This should not be needed, but can happen in 'broken' .blend files, /* This should not be needed, but can happen in 'broken' .blend files,