[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-474-gab857f6

[Dave H. <hel...@us...>]

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 has been updated
       via  ab857f62a5c9543050b95582e143aed28508b13c (commit)
      from  369f536e58e5153cca68f0cf11bf02a055b6b30d (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 ab857f62a5c9543050b95582e143aed28508b13c
Author: Dave Heller <hel...@us...>
Date:   Tue Sep 24 17:12:16 2013 -0400

    [sfcb-tix:#78] Missing null check in ift_getObjectPath, transposed debug stmts in memAlloc

-----------------------------------------------------------------------

Summary of changes:
 instance.c |    3 ++-
 support.c  |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/instance.c b/instance.c
index 52b25fe..c52e130 100644
--- a/instance.c
+++ b/instance.c
@@ -548,7 +548,8 @@ __ift_getObjectPath(const CMPIInstance *instance, CMPIStatus *rc)
     }
     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;
     }
 
diff --git a/support.c b/support.c
index d61dc22..b44bfb5 100644
--- a/support.c
+++ b/support.c
@@ -513,10 +513,10 @@ 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))
-        abort();
+    __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