fix a use-after-delete issue

arvidn · Apr 9, 2016 · 5f7cbb8 · 5f7cbb8
1 parent 0151d5c
commit 5f7cbb8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/include/simulator/simulator.hpp b/include/simulator/simulator.hpp
@@ -1326,6 +1326,14 @@ namespace sim
 				, seq_nr{0}
 			{}
 
+			// this is move-only
+#if LIBSIMULATOR_USE_MOVE
+			packet(packet const&) = delete;
+			packet& operator=(packet const&) = delete;
+			packet(packet&&) = default;
+			packet& operator=(packet&&) = default;
+#endif
+
 			// to keep things simple, don't drop ACKs or errors
 			bool ok_to_drop() const
 			{

diff --git a/src/tcp_socket.cpp b/src/tcp_socket.cpp
@@ -499,9 +499,9 @@ namespace ip {
 				// read, deliver the error
 				if (total_received > 0) break;
 
-				m_incoming_queue.erase(m_incoming_queue.begin());
 				assert(p.ec);
 				ec = p.ec;
+				m_incoming_queue.erase(m_incoming_queue.begin());
 				m_channel.reset();
 				return 0;
 			}