Merge PR #718: src/Cedar/BridgeUnix.c: resolve null pointer dereference

This commit is contained in:
Davide Beatrici authored and GitHub committed 2018-09-29 23:30:28 +02:00
commit 34f443c0c7
2 files changed
+85 -105

No files matched your search

+7 -28
View File
@@ -315,14 +315,7 @@ UINT Count(COUNTER *c)
Lock(c->lock);
{
if (c->Ready == false)
{
ret = 0;
}
else
{
ret = c->c;
}
ret = c->c;
}
Unlock(c->lock);
@@ -345,15 +338,8 @@ UINT Inc(COUNTER *c)
Lock(c->lock);
{
if (c->Ready == false)
{
ret = 0;
}
else
{
c->c++;
ret = c->c;
}
c->c++;
ret = c->c;
}
Unlock(c->lock);
@@ -380,21 +366,14 @@ UINT Dec(COUNTER *c)
Lock(c->lock);
{
if (c->Ready == false)
if (c->c != 0)
{
ret = 0;
c->c--;
ret = c->c;
}
else
{
if (c->c != 0)
{
c->c--;
ret = c->c;
}
else
{
ret = 0;
}
ret = 0;
}
}
Unlock(c->lock);