Menu
▾
▴
[Sblim-commit] Git: SFCC - Small Footprint CIM Client branch, master, updated. 167dcc80e145e486139266560b284aed7aa20f36
|
From: Chris B. <buc...@us...> - 2012-05-29 18:16:44
|
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 167dcc80e145e486139266560b284aed7aa20f36 (commit)
from 087eff10b2389b8834778aa2907ecca07ab10e66 (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 167dcc80e145e486139266560b284aed7aa20f36
Author: buccella <buc...@li...>
Date: Tue May 29 14:16:44 2012 -0400
[ 3530609 ] Various BEAM Errors
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index dd27ffe..86bf9af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-05-29 Chris Buccella <buc...@li...>
+ * TEST/v2test_ecn.c, backend/cimxml/cimXmlParser.c,
+ backend/cimxml/client.c, backend/cimxml/objectpath.c,
+ backend/cimxml/parserUtil.c, backend/cimxml/value.c:
+ [ 3530609 ] Various BEAM Errors
+
* backend/cimxml/property.c:
[ 3528819 ] Crash in getInstance when instance has NULL properties
(patch by Klaus Kampf)
diff --git a/NEWS b/NEWS
index 0652caa..2bd79aa 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Bugs:
- 3344757: Beam, deref of potential Null pointers.
- 3344917: Beam, file leak
- 3528819: Crash in getInstance when instance has NULL properties
+- 3530609: Various BEAM Errors
Changes in 2.2.3
================
diff --git a/TEST/v2test_ecn.c b/TEST/v2test_ecn.c
index 35b1e65..104ea4a 100644
--- a/TEST/v2test_ecn.c
+++ b/TEST/v2test_ecn.c
@@ -26,7 +26,7 @@ int main()
int rc;
CIMCStatus status;
CIMCClient *client;
- CIMCObjectPath *op;
+ CIMCObjectPath *op, *cop;
CIMCEnumeration *enm;
CIMCString *path;
CIMCData data;
@@ -74,9 +74,9 @@ int main()
return 1;
}
- op = ce->ft->newObjectPath(ce, "root/cimv2", NULL , &status);
+ cop = ce->ft->newObjectPath(ce, "root/cimv2", NULL , &status);
printf(" calling enumClassNames \n") ;
- enm = client->ft->enumClassNames(client, op, 0 , &status);
+ enm = client->ft->enumClassNames(client, cop, 0 , &status);
printf(" back from enumClassNames \n") ;
@@ -95,7 +95,7 @@ int main()
}
if(enm) enm->ft->release(enm);
- if(op) op->ft->release(op);
+ if(cop) cop->ft->release(cop);
if(client) client->ft->release(client);
if(ce) ce->ft->release(ce);
if(status.msg) CMRelease(status.msg);
diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c
index c6a0908..b7b590e 100644
--- a/backend/cimxml/cimXmlParser.c
+++ b/backend/cimxml/cimXmlParser.c
@@ -281,7 +281,7 @@ static int attrsOk(XmlBuffer * xb, const XmlElement * e, XmlAttr * r,
strcat(ptr," ");
strcat(ptr, tag);
Throw(xb, ptr);
- return -1;
+ return 0;
}
/* Is this Broken? I guess we don't allow escaping the quotes */
@@ -505,7 +505,7 @@ static int procIRetValue(parseUnion * lvalp, ParserControl * parm)
{NULL}
};
XmlAttr attr[0];
- memset(attr, 0, sizeof(attr));
+ // memset(attr, 0, sizeof(attr));
if (attrsOk(parm->xmb, elm, attr, "IRETURNVALUE", ZTOK_IRETVALUE)) {
return XTOK_IRETVALUE;
}
diff --git a/backend/cimxml/client.c b/backend/cimxml/client.c
index d38fd87..69b2848 100644
--- a/backend/cimxml/client.c
+++ b/backend/cimxml/client.c
@@ -2946,7 +2946,7 @@ static CIMCClient *xmlConnect2(CIMCEnv *env, const char *hn, const char *scheme,
curl_easy_setopt(cc->connection->mHandle,CURLOPT_SSLKEY,keyFile);
}
- CMSetStatus(rc, CMPI_RC_OK);
+ CMSetStatus(rc, CIMC_RC_OK);
return (CIMCClient*)cc;
}
diff --git a/backend/cimxml/objectpath.c b/backend/cimxml/objectpath.c
index a23b71d..cbb7dbd 100644
--- a/backend/cimxml/objectpath.c
+++ b/backend/cimxml/objectpath.c
@@ -104,9 +104,9 @@ static CMPIStatus __oft_setNameSpace ( CMPIObjectPath * cop,
{
struct native_cop * o = (struct native_cop *) cop;
- char * ns = ( nameSpace )? strdup ( nameSpace ): NULL;
-
if ( o ) {
+ char * ns = ( nameSpace )? strdup ( nameSpace ): NULL;
+
if ( o->nameSpace )
free ( o->nameSpace );
o->nameSpace = ns;
@@ -143,9 +143,9 @@ static CMPIStatus __oft_setClassName ( CMPIObjectPath * cop,
{
struct native_cop * o = (struct native_cop *) cop;
- char * cn = ( classname )? strdup ( classname ): NULL;
-
if ( o ) {
+ char * cn = ( classname )? strdup ( classname ): NULL;
+
if ( o->classname )
free ( o->classname );
o->classname = cn;
@@ -453,7 +453,7 @@ UtilList *getNameSpaceComponents(CMPIObjectPath * cop)
if (nss && nss->hdl) {
ns=(char*)nss->hdl;
- if (ns) for (s=i=0, m=strlen(ns); i<m; i++,s++) {
+ for (s=i=0, m=strlen(ns); i<m; i++,s++) {
if (ns[i]=='/') {
nsc[s]=0;
ul->ft->append(ul,strdup(nsc));
diff --git a/backend/cimxml/parserUtil.c b/backend/cimxml/parserUtil.c
index 9fa761e..cee43b0 100644
--- a/backend/cimxml/parserUtil.c
+++ b/backend/cimxml/parserUtil.c
@@ -85,7 +85,7 @@ void setInstProperties(CMPIInstance *ci, XtokProperties *ps)
CMPIValue val;
CMPIObjectPath *op;
CMPIStatus status;
- CMPIType type = NULL;
+ CMPIType type = CMPI_null;
XtokQualifier *nq = NULL,*q;
XtokQualifiers *qs;
int rc, n, setq;
diff --git a/backend/cimxml/value.c b/backend/cimxml/value.c
index bcc46df..026328d 100644
--- a/backend/cimxml/value.c
+++ b/backend/cimxml/value.c
@@ -110,37 +110,30 @@ CMPIValue native_clone_CMPIValue ( CMPIType type,
switch ( type ) {
case CMPI_instance:
- if (val->inst)
v.inst = CMClone ( val->inst, rc );
break;
case CMPI_ref:
- if (val->ref)
v.ref = CMClone ( val->ref, rc );
break;
case CMPI_args:
- if (val->args)
v.args = CMClone ( val->args, rc );
break;
case CMPI_enumeration:
- if (val->Enum)
v.Enum = CMClone ( val->Enum, rc );
break;
case CMPI_string:
- if (val->string)
v.string = CMClone ( val->string, rc );
break;
case CMPI_chars:
- if (val->chars)
v.chars = strdup ( val->chars );
break;
case CMPI_dateTime:
- if (val->dateTime)
v.dateTime = CMClone ( val->dateTime, rc );
break;
}
hooks/post-receive
--
SFCC - Small Footprint CIM Client
|
