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

heimdal:base: Don't perform arithmetic on a NULL pointer

Browse Source 
Doing so is undefined behaviour.

Change-Id: Ic57baac0fc5fb06945c0dfbd5d4eb913a12fc13d
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:
Joseph Sutton
2021-07-14 16:03:21 +12:00
committed by Jeffrey Altman
parent 1c93a6ff26
commit ef059b8831
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/base/heimbase.c
View File

@@ -86,11 +86,13 @@ struct heim_auto_release {
heim_object_t heim_object_t
heim_retain(heim_object_t ptr) heim_retain(heim_object_t ptr)
{ {
struct heim_base *p = PTR2BASE(ptr); struct heim_base *p;
if (ptr == NULL || heim_base_is_tagged(ptr)) if (ptr == NULL || heim_base_is_tagged(ptr))
return ptr; return ptr;
p = PTR2BASE(ptr);
if (heim_base_atomic_load(&p->ref_cnt) == heim_base_atomic_integer_max) if (heim_base_atomic_load(&p->ref_cnt) == heim_base_atomic_integer_max)
return ptr; return ptr;
@@ -109,11 +111,13 @@ void
heim_release(void *ptr) heim_release(void *ptr)
{ {
heim_base_atomic_integer_type old; heim_base_atomic_integer_type old;
struct heim_base *p = PTR2BASE(ptr); struct heim_base *p;
if (ptr == NULL || heim_base_is_tagged(ptr)) if (ptr == NULL || heim_base_is_tagged(ptr))
return; return;
p = PTR2BASE(ptr);
if (heim_base_atomic_load(&p->ref_cnt) == heim_base_atomic_integer_max) if (heim_base_atomic_load(&p->ref_cnt) == heim_base_atomic_integer_max)
return; return;
@@ -342,9 +346,10 @@ _heim_alloc_object(heim_type_t type, size_t size)
void * void *
_heim_get_isaextra(heim_object_t ptr, size_t idx) _heim_get_isaextra(heim_object_t ptr, size_t idx)
{ {
struct heim_base *p = (struct heim_base *)PTR2BASE(ptr); struct heim_base *p;
heim_assert(ptr != NULL, "internal error"); heim_assert(ptr != NULL, "internal error");
p = (struct heim_base *)PTR2BASE(ptr);
if (p->isa == &memory_object) if (p->isa == &memory_object)
return NULL; return NULL;
heim_assert(idx < 3, "invalid private heim_base extra data index"); heim_assert(idx < 3, "invalid private heim_base extra data index");
@@ -666,13 +671,15 @@ heim_auto_release_create(void)
heim_object_t heim_object_t
heim_auto_release(heim_object_t ptr) heim_auto_release(heim_object_t ptr)
{ {
struct heim_base *p = PTR2BASE(ptr); struct heim_base *p;
struct ar_tls *tls = autorel_tls(); struct ar_tls *tls = autorel_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);
/* drop from old pool */ /* drop from old pool */
if ((ar = p->autorelpool) != NULL) { if ((ar = p->autorelpool) != NULL) {
HEIMDAL_MUTEX_lock(&ar->pool_mutex); HEIMDAL_MUTEX_lock(&ar->pool_mutex);