generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid dereference of null pointer in ixmlNode_setNodeProperties.

Browse Source 
The problem can occur if one of the arguments is NULL.
Test argument and fix assertion.
(cherry picked from commit 3d7c1dbd59)
This commit is contained in:
Yoichi NAKAYAMA 2012-04-20 03:42:02 +09:00 committed by Marcelo Roberto Jimenez
parent 3b2cfdc45d
commit 76e8812acc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -332,6 +332,13 @@ Version 1.8.0
Version 1.6.18 Version 1.6.18
******************************************************************************* *******************************************************************************
2012-04-20 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Avoid dereference of null pointer in ixmlNode_setNodeProperties.
The problem can occur if one of the arguments is NULL.
Test argument and fix assertion.
2012-04-17 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com> 2012-04-17 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Create intermediate directory per project on vc9. Create intermediate directory per project on vc9.

5
ixml/src/node.c
View File

@ -1339,7 +1339,10 @@ int ixmlNode_setNodeProperties(
{ {
int rc; int rc;
assert(destNode != NULL || src != NULL); assert(destNode != NULL && src != NULL);
if(destNode == NULL || src == NULL) {
return IXML_INVALID_PARAMETER;
}
rc = ixmlNode_setNodeValue(destNode, src->nodeValue); rc = ixmlNode_setNodeValue(destNode, src->nodeValue);
if(rc != IXML_SUCCESS) { if(rc != IXML_SUCCESS) {