This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via 7a65569051f0601c69c62c9eeb85097dc238001b (commit)
from b6344bc23894624251034d5538374c2ec7b47c7f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7a65569051f0601c69c62c9eeb85097dc238001b
Author: Dave Heller <hel...@us...>
Date: Tue Sep 24 17:11:22 2013 -0400
[sfcb-tix:#78] Missing null check in ift_getObjectPath, transposed debug stmts in memAlloc
-----------------------------------------------------------------------
Summary of changes:
instance.c | 3 ++-
support.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/instance.c b/instance.c
index 2cc9dcb..e015bce 100644
--- a/instance.c
+++ b/instance.c
@@ -487,7 +487,8 @@ static CMPIObjectPath *__ift_getObjectPath(const CMPIInstance * instance,
}
if (! *mtx) {
mlogf(M_ERROR, M_SHOW, "--- Could not get op for instance of %s; mutex creation failure\n", cn);
- CMSetStatus(rc, CMPI_RC_ERR_FAILED);
+ if(rc)
+ CMSetStatus(rc, CMPI_RC_ERR_FAILED);
return NULL;
}
Broker->xft->lockMutex(*mtx);
diff --git a/support.c b/support.c
index 86994eb..d589712 100644
--- a/support.c
+++ b/support.c
@@ -501,10 +501,10 @@ void *memAlloc(int add, size_t size, int *memId)
_SFCB_ENTER(TRACE_MEMORYMGR, "mem_alloc");
void *result = calloc(1, size);
if (!result) {
- _SFCB_TRACE(1,("--- memAlloc %u %d\n", size, currentProc))
+ __ALLOC_ERROR(!result);
abort();
}
- __ALLOC_ERROR(!result);
+ _SFCB_TRACE(1,("--- memAlloc %u %d\n", size, currentProc));
if (add != MEM_TRACKED) {
memAdd(result,memId);
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
