oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

base: Fix UB

Browse Source
This commit is contained in:
Nicolas Williams
2022-10-25 23:24:43 -05:00
parent 07abfdb1a9
commit 476d216f89
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/base/heimbase.c
View File

@@ -260,9 +260,12 @@ heim_cmp(heim_object_t a, heim_object_t b)
static void HEIM_CALLCONV static void HEIM_CALLCONV
memory_dealloc(void *ptr) memory_dealloc(void *ptr)
{ {
struct heim_base_mem *p = (struct heim_base_mem *)PTR2BASE(ptr); if (ptr) {
if (p->dealloc) struct heim_base_mem *p = (struct heim_base_mem *)PTR2BASE(ptr);
p->dealloc(ptr);
if (p->dealloc)
p->dealloc(ptr);
}
} }
struct heim_type_data memory_object = { struct heim_type_data memory_object = {
@@ -672,13 +675,14 @@ heim_object_t
heim_auto_release(heim_object_t ptr) heim_auto_release(heim_object_t ptr)
{ {
struct heim_base *p; struct heim_base *p;
struct ar_tls *tls = autorel_tls(); struct ar_tls *tls;
heim_auto_release_t ar; heim_auto_release_t ar;
if (ptr == NULL || heim_base_is_tagged(ptr)) if (ptr == NULL || heim_base_is_tagged(ptr))
return ptr; return ptr;
p = PTR2BASE(ptr); p = PTR2BASE(ptr);
tls = autorel_tls();
/* drop from old pool */ /* drop from old pool */
if ((ar = p->autorelpool) != NULL) { if ((ar = p->autorelpool) != NULL) {