From 54ee5543c611365729d550793a23b3714c4a9acc Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 22 Mar 2016 11:58:32 +0530 Subject: [PATCH] Handle NULL flow in FLOW_LOCK. Change-Id: I8a202aca7dc7a7fd1bf86509b3509697b5e51f62 Closes-bug: #1552203 --- src/vnsw/agent/pkt/flow_table.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vnsw/agent/pkt/flow_table.cc b/src/vnsw/agent/pkt/flow_table.cc index e1b1dc71933..2dcc48e075f 100644 --- a/src/vnsw/agent/pkt/flow_table.cc +++ b/src/vnsw/agent/pkt/flow_table.cc @@ -53,8 +53,9 @@ const uint32_t FlowEntryFreeList::kMinThreshold; SandeshTraceBufferPtr FlowTraceBuf(SandeshTraceBufferCreate("Flow", 5000)); #define FLOW_LOCK(flow, rflow) \ - tbb::mutex tmp_mutex, *mutex_ptr_1, *mutex_ptr_2; \ - GetMutexSeq(flow->mutex(), rflow ? rflow->mutex() : tmp_mutex, \ + tbb::mutex tmp_mutex1, tmp_mutex2, *mutex_ptr_1, *mutex_ptr_2; \ + GetMutexSeq(flow ? flow->mutex() : tmp_mutex1, \ + rflow ? rflow->mutex() : tmp_mutex2, \ &mutex_ptr_1, &mutex_ptr_2); \ tbb::mutex::scoped_lock lock1(*mutex_ptr_1); \ tbb::mutex::scoped_lock lock2(*mutex_ptr_2);