[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs]  common/util plgnhand.cpp, 1.19, 1.20 mphandle.cpp, 1.5,
From:       mingda () helixcommunity ! org
Date:       2013-11-21 8:48:45
[Download RAW message or body]

Update of /cvsroot/server/common/util
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv24238/server/common/util

Modified Files:
	plgnhand.cpp mphandle.cpp logoutputs.cpp 
Log Message:
ommitted to: SERVER_CURRENT_RN, SERVER_15_1_0_RN

Reviewed by: Richard

Verification Build: 
http://mag-build.prognet.com/~build/report.cgi?id=11042

Synopsis:
=========
fix vhost memory leak

Branch: HEAD

Suggested Reviewers: anyone

Description:
============
fix vhost memory leak

Files affected:
===============
common/lang/xml/xmlconfig.cpp
server/common/util/plgnhand.cpp
server/common/util/mphandle.cpp
server/common/util/logoutputs.cpp
server_rn/common/util/vhostapi.cpp
server_rn/common/util/drmpathmap.cpp
server_rn/common/util/m3uutil.cpp
server/engine/core/rssmgr.cpp
server/log/tmplgpln/base_log.cpp
server/log/tmplgpln/clientstats_log.cpp
server/log/tmplgpln/tmplgpln.cpp
server/log/tmplgpln/wildcard_log.cpp
server/log/tmplgpln/rtspevents_log.cpp
server/log/tmplgpln/legacy_access_log.cpp
server/log/tmplgpln/error_log.cpp
server/log/tmplgpln/interval_log.cpp
server_rn /datatype/dashstrmhdl/dashmp4streamhandler.cpp
server_rn/datatype/dashpln/dashpln.cpp
server_rn/datatype/mpeg2ts/mpeg2tsplin.cpp
server_rn/common/dashutil/dashutil.cpp
sds/security/dauccfg.cpp
sds/security/daucplin.cpp
server-restricted/fs/encfs/encfobj.cpp
server_rn/broadcast/transport/mpeg2ts/recv/mp2tspln.cpp
filesystem/local/full/smplfsys.cpp
server/qos/core/uasconfigtree.cpp
server/engine/config/uasconfig.cpp
server/engine/dataflow/fsmanager.cpp
server-restricted/broadcast/transport/bcng/send-local/bdstplin.cpp


Testing Performed:
================
Unit Tests:
None

Integration Tests:

Leak Tests: None
Performance Tests: N/A

Platforms Tested: Windows

Builds Verified: Windows

QA Hints
========
None.



Index: mphandle.cpp
===================================================================
RCS file: /cvsroot/server/common/util/mphandle.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mphandle.cpp	18 May 2010 17:57:26 -0000	1.5
+++ mphandle.cpp	21 Nov 2013 08:48:42 -0000	1.6
@@ -160,6 +160,15 @@
 
 MountPointHandler::MountPointNode::~MountPointNode()
 {
+    CHXSimpleList::Iterator i;
+    if(m_pNodeList)
+    {
+        for (i = m_pNodeList->Begin(); i != m_pNodeList->End(); ++i)
+        {
+            delete (MountPointHandler::MountPointNode*)(*i);
+        }
+	HX_DELETE(m_pNodeList);
+    }
     delete[] m_pNodeName;
     HX_DELETE(m_pAMPList);
 }
@@ -195,6 +204,7 @@
         }
         delete m_pMPDescList;
     }
+    HX_DELETE(m_pTree);
 }
 /*
  *	Method:		MountPointHandler::IgnoreAMP()

Index: plgnhand.cpp
===================================================================
RCS file: /cvsroot/server/common/util/plgnhand.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- plgnhand.cpp	27 Aug 2013 08:57:02 -0000	1.19
+++ plgnhand.cpp	21 Nov 2013 08:48:42 -0000	1.20
@@ -192,6 +192,7 @@
 #define GENERAL_PLUGIN_RECORD_ENTRIES	    5
 #define ALLOWANCE_PLUGIN_RECORD_ENTRIES	    5
 
+
 // help functions
 void AppendListToRecord(CHXSimpleList* /*IN*/ pList, char** /*IN OUT*/ ppszRecord)
 {
@@ -4556,6 +4557,7 @@
     }
 
     plugin = pBestPlugin;
+    HX_RELEASE(options);
     options = pBestPlugin->m_options;
     if(options)
 	options->AddRef();

Index: logoutputs.cpp
===================================================================
RCS file: /cvsroot/server/common/util/logoutputs.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- logoutputs.cpp	24 May 2006 00:24:49 -0000	1.12
+++ logoutputs.cpp	21 Nov 2013 08:48:42 -0000	1.13
@@ -318,6 +318,9 @@
     HX_VECTOR_DELETE(m_szCurrentOpenFile);
     HX_VECTOR_DELETE(m_szLogDirectory);
     HX_VECTOR_DELETE(m_szFilenamePath);
+    HX_VECTOR_DELETE(m_szRollTimeAbs);
+    HX_RELEASE(m_pErrorLog);
+    HXMutexDestroy(m_FileMutex);
 }
 
 ///////////////////////////////////////////////////////////////////////////////


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]