Changeset 10604 for branches

Timestamp:

May 1, 2010, 3:00:17 PM (12 years ago)

Author:

livings124

Message:

(1.9x) #3041 blocklist should not try to add invalid lines to the blocklist, and should not print those invalid lines to the message queue

File:

• branches/1.9x/libtransmission/blocklist.c (modified) (6 diffs)

branches/1.9x/libtransmission/blocklist.c

@@ -12 +12 @@
 
 #include <stdio.h>
-#include <stdlib.h> /* free */
+#include <stdlib.h> /* free() */
 #include <string.h>
 
@@ -235 +235 @@
     FILE *       out;
     char *       line;
-    int          lineCount = 0;
+    int          inCount = 0;
+    int          outCount = 0;
     const char * err_fmt = _( "Couldn't read \"%1$s\": %2$s" );
 
@@ -269 +270 @@
         struct tr_ip_range range;
 
+        ++inCount;
+
         rangeBegin = strrchr( line, ':' );
         if( !rangeBegin ){ free( line ); continue; }
@@ -280 +283 @@
 
         if( !tr_pton( rangeBegin, &addr ) )
-            tr_err( "blocklist skipped invalid address [%s]\n", rangeBegin );
+        {
+            tr_err( _( "blocklist skipped invalid address at line %d" ), inCount );
+            free( line );
+            continue;
+        }
         range.begin = ntohl( addr.addr.addr4.s_addr );
 
         if( !tr_pton( rangeEnd, &addr ) )
-            tr_err( "blocklist skipped invalid address [%s]\n", rangeEnd );
+        {
+            tr_err( _( "blocklist skipped invalid address at line %d" ), inCount );
+            free( line );
+            continue;
+        }
         range.end = ntohl( addr.addr.addr4.s_addr );
 
@@ -297 +308 @@
         }
 
-        ++lineCount;
+        ++outCount;
     }
 
     {
         char * base = tr_basename( b->filename );
-        tr_inf( _( "Blocklist \"%1$s\" updated with %2$'d entries" ), base, lineCount );
+        tr_inf( _( "Blocklist \"%1$s\" updated with %2$'d entries" ), base, outCount );
         tr_free( base );
     }
-
 
     fclose( out );
@@ -312 +322 @@
     blocklistLoad( b );
 
-    return lineCount;
-}
-
+    return outCount;
+}
+