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

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/http httpprot.cpp,1.169.4.12,1.169.4.13
From:       yijil () helixcommunity ! org
Date:       2013-07-29 7:02:46
[Download RAW message or body]

Update of /cvsroot/server/protocol/http
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv25538

Modified Files:
      Tag: SERVER_15_1_0
	httpprot.cpp 
Log Message:
Committed to: SERVER_15_1_0_RN, HEAD

Reviewed by: Richard


Synopsis:
=========
Fix CA in uptime

Branch: SERVER_15_1_0_RN, HEAD

Suggested Reviewers: Anyone

Description:
============
StackID: 92ca926a
Count: 1
Stack Trace:
0x5b3e45: T dump_info(int, int, char const*, int, siginfo*, ucontext*):rmserver + 0x4c5
0x5bb182: T server_fault(int, siginfo*, ucontext*):rmserver + 0x432
0x3a1280f4a0: ???
0x65c53e: T HTTPProtocol::sendData(IHXBuffer*):rmserver + 0x1e
0x661c84: T HTTPProtocol::handleRead(unsigned char*, unsigned int, int):rmserver + 0x7f4
0x77258a: T HTTPFileResponse::ReadDone(int, IHXBuffer*):rmserver + 0x9a
0x7f627a6c779a: t M3UGenFileObject::ReadDone(int, IHXBuffer*):m3ugenfsys.so + 0x4a
0x7f628325c614: t CSimpleFileObject::FinishDoRead(unsigned int, IHXBuffer*&):smplfsys.so + 0x64
0x7f628325db24: t CSimpleFileObject::DoRead(int&):smplfsys.so + 0x84
0x7f628325ddca: t CSimpleFileObject::Read(unsigned int):smplfsys.so + 0x10a
0x7f627a6c742b: t M3UGenFileObject::Read(unsigned int):m3ugenfsys.so + 0xeb
0x65b883: T CHTTPDemux::EventPending(unsigned int, int):rmserver + 0x173
0x689d19: T CHXSocket::OnEvent(unsigned int):rmserver + 0x299
0x5e4602: T CServSockCB::Func():rmserver + 0x22
0x5d9f5d: T ServerEngine::mainloop(int):rmserver + 0x199d
0x5b7504: T PthreadEntryPoint(thread_args*):rmserver + 0x184
0x3a128077f1: ???
0x3a11ce570d: ???

My Fix:
Add protect code

Files affected:
===============
server/protocol/http/httpprot.cpp

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

Integration Tests:

Leak Tests: None
Performance Tests: N/A

Platforms Tested: CentOs64

Builds Verified: CentOs64

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



Index: httpprot.cpp
===================================================================
RCS file: /cvsroot/server/protocol/http/httpprot.cpp,v
retrieving revision 1.169.4.12
retrieving revision 1.169.4.13
diff -u -d -r1.169.4.12 -r1.169.4.13
--- httpprot.cpp	29 Jul 2013 06:54:21 -0000	1.169.4.12
+++ httpprot.cpp	29 Jul 2013 07:02:38 -0000	1.169.4.13
@@ -2709,7 +2709,7 @@
     HX_RESULT hxr = HXR_FAIL;
     if (m_pDemux)
     {
-        m_pDemux->SendMessage(pMsg);
+        hxr = m_pDemux->SendMessage(pMsg);
         if (FAILED(hxr))
         {
             Client* pClient = m_pDemux->GetClient(); // Demux does not AddRef client.


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