kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

add MEM_recallocN(), so bytes are ensured to be zero'd when growing.

Browse Source
This commit is contained in:
Campbell Barton 2012-08-11 12:16:09 +00:00
parent 0682c3f1ae
commit 51182bc78d
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/guardedalloc/MEM_guardedalloc.h
View File

@ -110,6 +110,16 @@ extern "C" {
#endif
;
/**
* A variant of realloc which zeros new bytes
*/
void *MEM_recallocN(void *vmemh, size_t len)
#if MEM_GNU_ATTRIBUTES
__attribute__((warn_unused_result))
__attribute__((alloc_size(2)))
#endif
;
/**
* Allocate a block of memory of size len, with tag name str. The
* memory is cleared. The name must be static, because only a

39
intern/guardedalloc/intern/mallocn.c
View File

@ -302,10 +302,45 @@ void *MEM_reallocN(void *vmemh, size_t len)
newp = MEM_mallocN(len, memh->name);
if (newp) {
if (len < memh->len)
if (len < memh->len) {
/* shrink */
memcpy(newp, vmemh, len);
else
}
else {
/* grow (or remain same size) */
memcpy(newp, vmemh, memh->len);
}
}
MEM_freeN(vmemh);
}
return newp;
}
void *MEM_recallocN(void *vmemh, size_t len)
{
void *newp = NULL;
if (vmemh) {
MemHead *memh = vmemh;
memh--;
newp = MEM_mallocN(len, memh->name);
if (newp) {
if (len < memh->len) {
/* shrink */
memcpy(newp, vmemh, len);
}
else {
memcpy(newp, vmemh, memh->len);
if (len > memh->len) {
/* grow */
/* zero new bytes */
memset(((char *)newp) + memh->len, 0, len - memh->len);
}
}
}
MEM_freeN(vmemh);

4
source/blender/avi/intern/avi.c
View File

@ -968,9 +968,7 @@ AviError AVI_write_frame(AviMovie *movie, int frame_num, ...)
const size_t entry_size = (movie->header->Streams + 1) * sizeof(AviIndexEntry);
if (movie->entries != NULL) {
temp = (AviIndexEntry *)MEM_reallocN(movie->entries, (frame_num + 1) * entry_size);
/* clear new bytes */
memset(&temp[movie->index_entries + 1], 0, (frame_num - movie->index_entries) * entry_size);
temp = (AviIndexEntry *)MEM_recallocN(movie->entries, (frame_num + 1) * entry_size);
}
else {
temp = (AviIndexEntry *) MEM_callocN((frame_num + 1) * entry_size, "newidxentry");