cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmJson.c Fixed bug in _cmJsonFindPathValue() (np==rp) and logic error in cmJsonBoolValue()

Browse Source
This commit is contained in:
kevin 2012-12-03 17:10:26 -08:00
parent 5fe66b872a
commit 7aa3599d27
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmJson.c
View File

@ -1039,15 +1039,14 @@ cmJsonNode_t* cmJsonFindValue( cmJsonH_t h, const char* label, const cmJsonNode_
} }
cmJsRC_t _cmJsonFindPathValue( cmJs_t* p, const char* pathPrefix, const char* path, const cmJsonNode_t* np, const cmJsonNode_t** rpp ) cmJsRC_t _cmJsonFindPathValue( cmJs_t* p, const char* pathPrefix, const char* path, const cmJsonNode_t* rp, const cmJsonNode_t** rpp )
{ {
cmJsRC_t rc = kOkJsRC; cmJsRC_t rc = kOkJsRC;
const cmJsonNode_t* rp = np;
if( np == NULL ) if( rp == NULL )
rp = p->rootPtr; rp = p->rootPtr;
if( np == NULL ) if( rp == NULL )
return kOkJsRC; return kOkJsRC;
assert( cmJsonIsObject(rp)); assert( cmJsonIsObject(rp));
@ -1438,7 +1437,7 @@ cmJsRC_t cmJsonStringValue( const cmJsonNode_t* vp, const char **retPtrPtr )
{ {
cmJsRC_t rc = kOkJsRC; cmJsRC_t rc = kOkJsRC;
if( vp == NULL && vp->typeId != kStringTId ) if( vp == NULL || vp->typeId != kStringTId )
return kNodeCannotCvtJsRC; return kNodeCannotCvtJsRC;
*retPtrPtr = vp->u.stringVal; *retPtrPtr = vp->u.stringVal;