d4708/opentracker
1
0
Fork 0
mirror of git://erdgeist.org/opentracker synced 2025-01-14 08:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix a pointer arithmetic issue leading to incorrect peer data being copied. Allocate correct size for debugbuffer. Expect exact values on find keywords, not only prefix match.

Browse Source
This commit is contained in:
erdgeist 2009-01-16 04:17:22 +00:00
parent 0b875273d4
commit 2d3718151d
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opentracker.c
View File

@ -201,7 +201,7 @@ static void server_mainloop( ) {
ws.inbuf = malloc( G_INBUF_SIZE );
ws.outbuf = malloc( G_OUTBUF_SIZE );
#ifdef _DEBUG_HTTPERROR
ws.debugbuf= malloc( G_INBUF_SIZE );
ws.debugbuf= malloc( G_DEBUGBUF_SIZE );
#endif
if( !ws.inbuf || !ws.outbuf )
panic( "Initializing worker failed" );

4
ot_http.c
View File

@ -247,7 +247,7 @@ static ssize_t http_handle_fullscrape( const int64 sock, struct ot_workstruct *w
stats_issue_event( EVENT_FULLSCRAPE_REQUEST, 0, (uintptr_t)cookie->ip );
#ifdef _DEBUG_HTTPERROR
write( 2, ws->debugbuf, G_DEBUGBUF_SIZE );
fprintf( stderr, "%s", ws->debugbuf );
#endif
/* Pass this task to the worker thread */
@ -299,7 +299,7 @@ static ssize_t http_handle_scrape( const int64 sock, struct ot_workstruct *ws, c
return ws->reply_size;
}
static ot_keywords keywords_announce[] = { { "port", 1 }, { "left", 2 }, { "event", 3 }, { "numwant", 4 }, { "compact", 5 }, { "info_hash", 6 },
static ot_keywords keywords_announce[] = { { "port", 1 }, { "left", 2 }, { "event", 3 }, { "numwant", 4 }, { "compact", 5 }, { "compact6", 5 }, { "info_hash", 6 },
#ifdef WANT_IP_FROM_QUERY_STRING
{ "ip", 7 },
#endif

2
scan_urlencoded_query.c
View File

@ -75,7 +75,7 @@ int scan_find_keywords( const ot_keywords * keywords, char **string, SCAN_SEARCH
if( match_length == 0 ) return -3;
while( keywords->key ) {
if( !memcmp( keywords->key, deststring, match_length ) )
if( !memcmp( keywords->key, deststring, match_length ) && !keywords->key[match_length] )
return keywords->value;
keywords++;
}

5
trackerlogic.c
View File

@ -129,7 +129,7 @@ size_t add_peer_to_torrent_and_return_peers( ot_hash hash, ot_peer *peer, PROTO_
OT_PEERFLAG( peer ) |= PEER_FLAG_COMPLETED;
}
*peer_dest = *peer;
memcpy( peer_dest, peer, sizeof(ot_peer) );
#ifdef WANT_SYNC
if( proto == FLAG_MCA ) {
mutex_bucket_unlock_by_hash( hash, delta_torrentcount );
@ -156,8 +156,7 @@ static size_t return_peers_all( ot_peerlist *peer_list, char *reply ) {
ot_peer * peers = (ot_peer*)bucket_list[bucket].data;
size_t peer_count = bucket_list[bucket].size;
while( peer_count-- ) {
memcpy(r,peers,OT_PEER_COMPARE_SIZE);
peers+=sizeof(ot_peer);
memcpy(r,peers++,OT_PEER_COMPARE_SIZE);
r+=OT_PEER_COMPARE_SIZE;
}
}