[pupnp-commits] [SCM] pupnp branch branch-1.6.x updated. last_svn_1.6.x-345-gd9e9049

[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  d9e90499b7ead7e9fae30b9c248b343ec6d9b273 (commit)
      from  6db2271ac36adb6f5bc210240ed41ec8aad2c57f (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=d9e90499b7ead7e9fae30b9c248b343ec6d9b273

commit d9e90499b7ead7e9fae30b9c248b343ec6d9b273
Author: Yoichi NAKAYAMA <yoi...@gm...>
Date:   Tue Jun 19 19:13:46 2012 +0900

    Fix memory leak and access violation in UpnpSendAction(Ex)Async.
    
    Free buffers after malloc or ixmlPrintNode failure.
    Free Param->Header before destructing Param.

diff --git a/ChangeLog b/ChangeLog
index aa33651..904d009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 Version 1.6.18
 *******************************************************************************
 
+2012-06-19 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+	Fix memory leak and access violation in UpnpSendAction(Ex)Async.
+
+	Free buffers after malloc or ixmlPrintNode failure.
+	Free Param->Header before destructing Param.
+
 2012-05-25 Anoop Mohan <anoop.anoop(at)gmail.com>
 
 	This patch fixes a bug in non blocking connect call where the sock
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index e5196bf..dcc62bb 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -2736,6 +2736,7 @@ int UpnpSendActionAsync(
         malloc( sizeof( struct UpnpNonblockParam ) );
 
     if( Param == NULL ) {
+        ixmlFreeDOMString( tmpStr );
         return UPNP_E_OUTOF_MEMORY;
     }
     memset( Param, 0, sizeof( struct UpnpNonblockParam ) );
@@ -2829,6 +2830,7 @@ int UpnpSendActionExAsync(
 
     tmpStr = ixmlPrintNode( ( IXML_Node * ) Act );
     if( tmpStr == NULL ) {
+        ixmlFreeDOMString( headerStr );
         return UPNP_E_INVALID_ACTION;
     }
 
@@ -2836,6 +2838,8 @@ int UpnpSendActionExAsync(
         ( struct UpnpNonblockParam * )
         malloc( sizeof( struct UpnpNonblockParam ) );
     if( Param == NULL ) {
+        ixmlFreeDOMString( tmpStr );
+        ixmlFreeDOMString( headerStr );
         return UPNP_E_OUTOF_MEMORY;
     }
     memset( Param, 0, sizeof( struct UpnpNonblockParam ) );
@@ -2859,10 +2863,10 @@ int UpnpSendActionExAsync(
 
     retVal = ixmlParseBufferEx( tmpStr, &( Param->Act ) );
     if( retVal != IXML_SUCCESS ) {
+        ixmlDocument_free( Param->Header );
         free( Param );
         ixmlFreeDOMString( tmpStr );
         ixmlFreeDOMString( headerStr );
-        ixmlDocument_free( Param->Header );
         if( retVal == IXML_INSUFFICIENT_MEMORY ) {
             return UPNP_E_OUTOF_MEMORY;
         } else {

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

Summary of changes:
 ChangeLog              |    7 +++++++
 upnp/src/api/upnpapi.c |    6 +++++-
 2 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
pupnp