Zander671/refcount
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unprotected access in refcount_context_num_refs

Browse Source
This commit is contained in:
Alexander Rosenberg
2025-09-08 17:59:50 -07:00
parent b18b59eeb0
commit 52008a0110
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/refcount/config.h.in
View File

@ -3,10 +3,4 @@
#cmakedefine REFCOUNT_HAS_THREADS #cmakedefine REFCOUNT_HAS_THREADS
#if defined(REFCOUNT_HAS_THREADS) \
&& (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L)
# error \
"RefCount needs to be compiled with at least C11 for thread support to work."
#endif
#endif #endif

15
include/refcount/refcount.h
View File

@ -162,7 +162,20 @@ static inline bool refcount_context_is_static(const RefcountContext *ctx,
*/ */
static inline uint64_t refcount_context_num_refs(const RefcountContext *ctx, static inline uint64_t refcount_context_num_refs(const RefcountContext *ctx,
void *obj) { void *obj) {
return REFCOUNT_OBJECT_ENTRY(ctx, obj)->impl.counted.ref_count; #ifdef REFCOUNT_HAS_THREADS
if (!mtx_lock(&REFCOUNT_OBJECT_ENTRY(ctx, obj)->weak_ref->mtx)) {
// just try our best to estimate, if we are on a platform where 64bit
// stores are not atomic (or this is not aligned properly), this might
// race and give a bogus number
return REFCOUNT_OBJECT_ENTRY(ctx, obj)->impl.counted.ref_count;
}
#endif
const uint64_t count =
REFCOUNT_OBJECT_ENTRY(ctx, obj)->impl.counted.ref_count;
#ifdef REFCOUNT_HAS_THREADS
mtx_unlock(&REFCOUNT_OBJECT_ENTRY(ctx, obj)->weak_ref->mtx);
#endif
return count;
} }
bool refcount_context_init_obj(const RefcountContext *ctx, void *obj); bool refcount_context_init_obj(const RefcountContext *ctx, void *obj);