interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ugh of course I screwed up the malloc() test. Fixed a crash on GTK+ since I guess OS X malloc() autofills to 0?

This commit is contained in:
Pietro Gagliardi 2017-02-20 15:14:53 -05:00
parent 6ae6e91238
commit ea473a3411
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
darwin/alloc.m
View File

@ -71,7 +71,7 @@ void *uiRealloc(void *p, size_t new, const char *type)
abort(); abort();
} }
s = SIZE(out); s = SIZE(out);
if (new <= *s) if (new > *s)
memset(((uint8_t *) DATA(out)) + *s, 0, new - *s); memset(((uint8_t *) DATA(out)) + *s, 0, new - *s);
*s = new; *s = new;
[allocations removeObject:[NSValue valueWithPointer:p]]; [allocations removeObject:[NSValue valueWithPointer:p]];

2
unix/alloc.c
View File

@ -64,7 +64,7 @@ void *uiRealloc(void *p, size_t new, const char *type)
p = BASE(p); p = BASE(p);
out = g_realloc(p, EXTRA + new); out = g_realloc(p, EXTRA + new);
s = SIZE(out); s = SIZE(out);
if (new <= *s) if (new > *s)
memset(((uint8_t *) DATA(out)) + *s, 0, new - *s); memset(((uint8_t *) DATA(out)) + *s, 0, new - *s);
*s = new; *s = new;
if (g_ptr_array_remove(allocations, p) == FALSE) if (g_ptr_array_remove(allocations, p) == FALSE)

1
windows/alloc.cpp
View File

@ -45,6 +45,7 @@ void *uiRealloc(void *_p, size_t size, const char *type)
if (p == NULL) if (p == NULL)
return uiAlloc(size, type); return uiAlloc(size, type);
arr = heap[p]; arr = heap[p];
// TODO does this fill in?
arr->resize(size, 0); arr->resize(size, 0);
heap.erase(p); heap.erase(p);
heap[rawBytes(arr)] = arr; heap[rawBytes(arr)] = arr;