emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: the uref functions were insufficiently robust

Browse Source 
The earlier attempt at protecting these functions from
already freed memory worked just fine until the memory
was, in fact, reused by the OS. At that point, the ref
count would most likely fail an existing a test for 0.

So this commit will take control of the 'info' pointer
and force it to NULL when a reference count reaches 0.

Plus, since it makes little sense returning an address
that a caller already has, henceforth we will return a
reference count out of the 'ref' and 'unref functions.

Reference(s):
commit 74beff80ff

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner
2015-06-30 00:00:00 -05:00
committed by Craig Small
parent ff852103f8
commit faf6d4dc93
8 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
proc/meminfo.c
View File

@ -214,25 +214,27 @@ PROCPS_EXPORT int procps_meminfo_read (
}
PROCPS_EXPORT struct procps_meminfo *procps_meminfo_ref (
PROCPS_EXPORT int procps_meminfo_ref (
struct procps_meminfo *info)
{
if (info == NULL)
return NULL;
return -EINVAL;
info->refcount++;
return info;
return info->refcount;
}
PROCPS_EXPORT struct procps_meminfo *procps_meminfo_unref (
struct procps_meminfo *info)
PROCPS_EXPORT int procps_meminfo_unref (
struct procps_meminfo **info)
{
if (info == NULL || info->refcount == 0)
return NULL;
info->refcount--;
if (info->refcount > 0)
return info;
free(info);
return NULL;
if (info == NULL || *info == NULL)
return -EINVAL;
(*info)->refcount--;
if ((*info)->refcount == 0) {
free(*info);
*info = NULL;
return 0;
}
return (*info)->refcount;
}
/* Accessor functions */