Handle NULL flow in FLOW_LOCK.

Change-Id: I8a202aca7dc7a7fd1bf86509b3509697b5e51f62 Closes-bug: #1552203
Juniper · Mar 23, 2016 · 54ee554 · 54ee554
1 parent d34c84d
commit 54ee554
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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);