Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-08 09:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

(libT) #1552: Blocklists fail when Windows newlines are present

Browse Source
This commit is contained in:
Charles Kerr
2008-12-03 05:28:09 +00:00
parent a49511bc49
commit 3bc08c53f0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libtransmission/blocklist.c
+8 -5
View File
@@ -198,8 +198,8 @@ _tr_blocklistSetEnabled( tr_blocklist * b,
}
int
_tr_blocklistHasAddress( tr_blocklist * b,
const struct tr_address * addr )
_tr_blocklistHasAddress( tr_blocklist * b,
const tr_address * addr )
{
uint32_t needle;
const struct tr_ip_range * range;
@@ -257,9 +257,10 @@ _tr_blocklistSetContent( tr_blocklist * b,
while( !fggets( &line, in ) )
{
char * rangeBegin;
char * rangeEnd;
struct tr_address addr;
char * rangeBegin;
char * rangeEnd;
char * crpos;
tr_address addr;
struct tr_ip_range range;
rangeBegin = strrchr( line, ':' );
@@ -269,6 +270,8 @@ _tr_blocklistSetContent( tr_blocklist * b,
rangeEnd = strchr( rangeBegin, '-' );
if( !rangeEnd ){ free( line ); continue; }
*rangeEnd++ = '\0';
if(( crpos = strchr( rangeEnd, '\r' )))
*crpos = '\0';
if( !tr_pton( rangeBegin, &addr ) )
tr_err( "blocklist skipped invalid address [%s]\n", rangeBegin );