Changeset 10533

Timestamp:

Apr 27, 2010, 3:58:25 AM (12 years ago)

Author:

charles

Message:

(trunk libT) #3041 "Blocklist - bad peers decreases after update; corrupt error messages" -- better error messages when fed unprintable characters

File:

• trunk/libtransmission/blocklist.c (modified) (6 diffs)

trunk/libtransmission/blocklist.c

@@ -11 +11 @@
  */
 
+#include <ctype.h> /* isprint() */
 #include <stdio.h>
-#include <stdlib.h> /* free */
+#include <stdlib.h> /* free() */
 #include <string.h>
 
@@ -235 +236 @@
     FILE *       out;
     char *       line;
-    int          lineCount = 0;
+    int          inCount = 0;
+    int          outCount = 0;
     const char * err_fmt = _( "Couldn't read \"%1$s\": %2$s" );
 
@@ -263 +265 @@
     while( !fggets( &line, in ) )
     {
+        const char * pch;
         char * rangeBegin;
         char * rangeEnd;
@@ -268 +271 @@
         tr_address  addr;
         struct tr_ip_range range;
+
+        ++inCount;
+
+        for( pch=line; pch && *pch; ++pch )
+            if( !isprint( *pch ) )
+                break;
+        if( !pch || *pch ) {
+            tr_err( "skipping line #%d which contains nonprintable characters\n", inCount );
+            free( line );
+            continue;
+        }
 
         rangeBegin = strrchr( line, ':' );
@@ -297 +311 @@
         }
 
-        ++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 );
     }
@@ -312 +326 @@
     blocklistLoad( b );
 
-    return lineCount;
-}
-
+    return outCount;
+}
+