uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Fix gfxRealloc bug for RAW32 (and derivitives)

Browse source
This commit is contained in:
inmarket 2018-10-14 14:59:40 +10:00
parent 0f3310dd34
commit 6a69c5673f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -44,6 +44,7 @@ FEATURE: Added support for ChibiOS Kernel V5
FEATURE: Added WS29EPD WaveShare E-Paper display
FIX: Fixed GQUEUE full synchronous function signatures
CHANGE: Removed label widget auto-sizing during redraw. It will still auto-size during creation
FIX: Fixed realloc bug for RAW32 (and derivitives)
*** Release 2.8 ***

4
src/gos/gos_x_heap.c
View file

@ -135,7 +135,7 @@
// We need to do this the hard way
pfree = gfxAlloc(sz);
if (pfree)
if (!pfree)
return 0;
memcpy(pfree, ptr, p->sz - sizeof(memslot));
gfxFree(ptr);
@ -162,7 +162,7 @@
break;
}
}
// Find a free slot that is contiguous after and merge it into this one
for (prev = 0, pfree = freeSlots; pfree != 0; prev = pfree, pfree = NextFree(pfree)) {
if (pfree == (memslot *)((char *)p + p->sz)) {