Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Can't read negative number of bytes.

Browse Source 
This completely ignores error handling, which probably should be added.
The code behavior doesn't change, as the existing comparisons and
asserts already promoted the signed value to unsigned.
This commit is contained in:
Bartosz Taudul 2019-06-22 14:08:48 +02:00
parent 1c41229766
commit fadf8e3e0a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/TracySocket.cpp
View File

@ -518,7 +518,7 @@ void UdpListen::Close()
m_sock = -1; m_sock = -1;
} }
const char* UdpListen::Read( int& len, IpAddress& addr ) const char* UdpListen::Read( size_t& len, IpAddress& addr )
{ {
static char buf[2048]; static char buf[2048];
@ -529,7 +529,7 @@ const char* UdpListen::Read( int& len, IpAddress& addr )
sockaddr sa; sockaddr sa;
socklen_t salen = sizeof( struct sockaddr ); socklen_t salen = sizeof( struct sockaddr );
len = recvfrom( m_sock, buf, 2048, 0, &sa, &salen ); len = (size_t)recvfrom( m_sock, buf, 2048, 0, &sa, &salen );
addr.Set( sa ); addr.Set( sa );
return buf; return buf;

2
common/TracySocket.hpp
View File

@ -115,7 +115,7 @@ public:
bool Listen( int port ); bool Listen( int port );
void Close(); void Close();
const char* Read( int& len, IpAddress& addr ); const char* Read( size_t& len, IpAddress& addr );
UdpListen( const UdpListen& ) = delete; UdpListen( const UdpListen& ) = delete;
UdpListen( UdpListen&& ) = delete; UdpListen( UdpListen&& ) = delete;

2
profiler/src/main.cpp
View File

@ -295,7 +295,7 @@ int main( int argc, char** argv )
else else
{ {
tracy::IpAddress addr; tracy::IpAddress addr;
int len; size_t len;
auto msg = broadcastListen->Read( len, addr ); auto msg = broadcastListen->Read( len, addr );
if( msg ) if( msg )
{ {

4
server/TracyFileRead.hpp
View File

@ -202,7 +202,7 @@ private:
if( fread( &sz, 1, sizeof( sz ), m_file ) == sizeof( sz ) ) if( fread( &sz, 1, sizeof( sz ), m_file ) == sizeof( sz ) )
{ {
fread( m_lz4buf, 1, sz, m_file ); fread( m_lz4buf, 1, sz, m_file );
m_lastBlock = LZ4_decompress_safe_continue( m_stream, m_lz4buf, m_second, sz, BufSize ); m_lastBlock = (size_t)LZ4_decompress_safe_continue( m_stream, m_lz4buf, m_second, sz, BufSize );
} }
else else
{ {
@ -219,7 +219,7 @@ private:
char* m_buf; char* m_buf;
char* m_second; char* m_second;
size_t m_offset; size_t m_offset;
int m_lastBlock; size_t m_lastBlock;
std::atomic<bool> m_signalSwitch; std::atomic<bool> m_signalSwitch;
std::atomic<bool> m_signalAvailable; std::atomic<bool> m_signalAvailable;