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

List:       helix-server-cvs
Subject:    [Server-cvs] engine/session clientsession.cpp, 1.72.2.28.2.19,
From:       jzeng () helixcommunity ! org
Date:       2008-11-07 4:53:37
Message-ID: 200811070500.mA750uK9023324 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/engine/session
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv31480

Modified Files:
      Tag: SERVER_12_0
	clientsession.cpp 
Log Message:
Synopsis
========
Bug 230837: CA in ClientSessionMSwitchSource when the client is
terminated before the 2nd switch is pending.
Branches:  head, server_12_0, server_12_1 
Suggested Reviewer: anyone

Description
===========
Cause by unexpected call sequences.

Fix: the magic 4 lines
Index: clientsession.cpp
===================================================================
RCS file: /cvsroot/server/engine/session/clientsession.cpp,v
retrieving revision 1.72.2.28.2.19
diff -u -w -r1.72.2.28.2.19 clientsession.cpp
--- clientsession.cpp   7 Oct 2008 22:23:48 -0000       1.72.2.28.2.19
+++ clientsession.cpp   7 Nov 2008 00:16:48 -0000
@@ -5643,6 +5643,11 @@
 
 HX_RESULT ClientSession::SwitchSource()
 {
+    if (m_bDone)
+    {
+        return HXR_OK;
+    }
+
     HX_RESULT status = HXR_OK;
 
     //the packetsourceShim need to decide when to switch. The
     //majority of
cvs diff: Diffing pub
cvs diff: Diffing unittest


Files Affected
==============
server/engine/session/clientsession.cpp

Testing Performed
=================

Unit Tests:
None.

Integration Tests:
Verify the bug is fixed.

Leak Tests:
--lct test. 

Performance Tests:
- None

Platforms Tested: linux-rhel4-i686
Build verified: linux-rhel4-i686




Index: clientsession.cpp
===================================================================
RCS file: /cvsroot/server/engine/session/clientsession.cpp,v
retrieving revision 1.72.2.28.2.19
retrieving revision 1.72.2.28.2.20
diff -u -d -r1.72.2.28.2.19 -r1.72.2.28.2.20
--- clientsession.cpp	7 Oct 2008 22:23:48 -0000	1.72.2.28.2.19
+++ clientsession.cpp	7 Nov 2008 04:53:34 -0000	1.72.2.28.2.20
@@ -5643,6 +5643,11 @@
 
 HX_RESULT ClientSession::SwitchSource()
 {
+    if (m_bDone)
+    {
+        return HXR_OK;
+    }
+
     HX_RESULT status = HXR_OK;
 
     //the packetsourceShim need to decide when to switch. The majority of


_______________________________________________
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]