pgimeno
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BufferedPacket race condition (fixes #2983) 

This was caused by the use the non-threadsafe SharedBuffer in a
threaded context.
master
kwolekr 2015-08-06 02:15:21 -04:00
parent bd0b469d3d
commit 8560ece02e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/connection.h
View File

@ -172,7 +172,7 @@ struct BufferedPacket
data(a_size), time(0.0), totaltime(0.0), absolute_send_time(-1), data(a_size), time(0.0), totaltime(0.0), absolute_send_time(-1),
resend_count(0) resend_count(0)
{} {}
SharedBuffer<u8> data; // Data of the packet, including headers Buffer<u8> data; // Data of the packet, including headers
float time; // Seconds from buffering the packet or re-sending float time; // Seconds from buffering the packet or re-sending
float totaltime; // Seconds from buffering the packet float totaltime; // Seconds from buffering the packet
unsigned int absolute_send_time; unsigned int absolute_send_time;

8
src/util/pointer.h
View File

@ -178,6 +178,14 @@ private:
unsigned int m_size; unsigned int m_size;
}; };
/************************************************
* !!! W A R N I N G !!! *
* !!! A C H T U N G !!! *
* *
* This smart pointer class is NOT thread safe. *
* ONLY use in a single-threaded context! *
* *
************************************************/
template <typename T> template <typename T>
class SharedBuffer class SharedBuffer
{ {