trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r1180777 - in /trafficserver/traffic/trunk: CHANGES proxy/logging/LogCollationClientSM.cc
Date Mon, 10 Oct 2011 03:48:00 GMT
Author: zym
Date: Mon Oct 10 03:47:59 2011
New Revision: 1180777

URL: http://svn.apache.org/viewvc?rev=1180777&view=rev
Log:
TS-932 m_pending_event == NULL crash in LogCollationClientSM.cc

Author: weijin

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1180777&r1=1180776&r2=1180777&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Mon Oct 10 03:47:59 2011
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.1
+  *) [TS-932] Fix m_pending_event == NULL crash in LogCollationClientSM.cc
+   Author: weijin
+
   *) [TS-979] Found a few places where we can segfault with strlcpy.
 
   *) [TS-938] Fix VIA to avoid loopback address.

Modified: trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc?rev=1180777&r1=1180776&r2=1180777&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc Mon Oct 10 03:47:59
2011
@@ -501,7 +501,9 @@ LogCollationClientSM::client_init(int ev
   case LOG_COLL_EVENT_SWITCH:
     m_client_state = LOG_COLL_CLIENT_INIT;
     ink_assert(m_pending_event == NULL);
+    ink_mutex_acquire(&(mutex->the_mutex));
     m_pending_event = eventProcessor.schedule_imm(this);
+    ink_mutex_release(&(mutex->the_mutex));
     return EVENT_CONT;
 
   case EVENT_IMMEDIATE:



Mime
View raw message