[pupnp-commits] [SCM] pupnp branch branch-1.6.x updated. last_svn_1.6.x-340-g3d7c1db

[Yoichi N. <yo...@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 "pupnp".

The branch, branch-1.6.x has been updated
       via  3d7c1dbd5901300d0ad7db6653e8008aa54ab89c (commit)
      from  e52e7e0bd3e43df357e1586427e2264538013fd0 (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 -----------------------------------------------------------------
http://pupnp.git.sourceforge.net/git/gitweb.cgi/?id=3d7c1dbd5901300d0ad7db6653e8008aa54ab89c

commit 3d7c1dbd5901300d0ad7db6653e8008aa54ab89c
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date:   Fri Apr 20 03:42:02 2012 +0900

    Avoid dereference of null pointer in ixmlNode_setNodeProperties.
    
    The problem can occur if one of the arguments is NULL.
    Test argument and fix assertion.

diff --git a/ChangeLog b/ChangeLog
index 8c7d3d3..afd5c9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 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>
 
 	Create intermediate directory per project on vc9.
diff --git a/ixml/src/node.c b/ixml/src/node.c
index c20b841..1d1ec16 100644
--- a/ixml/src/node.c
+++ b/ixml/src/node.c
@@ -1339,7 +1339,10 @@ int ixmlNode_setNodeProperties(
 {
 	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);
 	if(rc != IXML_SUCCESS) {

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

Summary of changes:
 ChangeLog       |    7 +++++++
 ixml/src/node.c |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
pupnp