[Sblim-commit] Git: SFCC - Small Footprint CIM Client branch, master, updated. 087eff10b2389b8834778aa2907ecca07ab10e66

[Chris B. <buc...@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 "SFCC - Small Footprint CIM Client".

The branch, master has been updated
       via  087eff10b2389b8834778aa2907ecca07ab10e66 (commit)
      from  9ea0e948eb61e753539f42231223968a1a81d6cb (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 087eff10b2389b8834778aa2907ecca07ab10e66
Author: buccella <buc...@li...>
Date:   Tue May 29 13:58:09 2012 -0400

    [ 3528819 ] Crash in getInstance when instance has NULL properties

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index a90147c..dd27ffe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-29  Chris Buccella  <buc...@li...>
+
+	* backend/cimxml/property.c:
+	[ 3528819 ] Crash in getInstance when instance has NULL properties
+	(patch by Klaus Kampf)
+
 2011-06-29  Michael Chase-Salerno <br...@li...>
 
 	* cimc/cimcclient.c:
diff --git a/NEWS b/NEWS
index 1c6463e..0652caa 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Bugs:
 - 3344403: Beam, unitialized vars
 - 3344757: Beam, deref of potential Null pointers.
 - 3344917: Beam, file leak
+- 3528819: Crash in getInstance when instance has NULL properties
 
 Changes in 2.2.3
 ================
diff --git a/backend/cimxml/property.c b/backend/cimxml/property.c
index 592ea2b..2d061bf 100644
--- a/backend/cimxml/property.c
+++ b/backend/cimxml/property.c
@@ -243,15 +243,16 @@ static struct native_property * __clone ( struct native_property * prop,
 	result->name  = strdup ( prop->name );
 	result->type  = prop->type;
 	result->state = prop->state;
-	result->value = native_clone_CMPIValue ( prop->type,
-						 &prop->value,
-						 &tmp );
-
-	if ( tmp.rc != CMPI_RC_OK ) {
+        if (prop->state != CMPI_nullValue
+            && prop->state != CMPI_badValue) {
+          result->value = native_clone_CMPIValue ( prop->type,
+                                                   &prop->value,
+                                                   &tmp );
+          if ( tmp.rc != CMPI_RC_OK ) {
 
 		result->state = CMPI_nullValue;
-	}
-
+	  }
+        }
 	result->qualifiers    = qualifierFT.clone ( prop->qualifiers, rc );
         
 	result->next  = __clone ( prop->next, rc );
diff --git a/contributions.txt b/contributions.txt
index d37e6a4..0a2984c 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -38,6 +38,7 @@ Klaus Kampf, Novell
 09/22/2009 [ 2849853 ] getClass reports most property types as CMPI_Instance
 03/23/2011 [ 2990315 ] cmciRelease not called in case of error
 04/25/2011 [ 2967265 ] code cleanup in sfcclient
+05/29/2012 [ 3528819 ] Crash in getInstance when instance has NULL properties
 
 Suresh Sundriyal, VMWare
 ------------------------


hooks/post-receive
-- 
SFCC - Small Footprint CIM Client