Changeset 4877

Timestamp:

Jan 31, 2008, 3:09:24 AM (15 years ago)

Author:

charles

Message:

(1.0x) fix off-by-one that was uncovered by the new benc's stricter parsing.

Location:

branches/1.0x/libtransmission

Files:

• bencode-test.c (modified) (1 diff)
• bencode.c (modified) (4 diffs)
• tracker.c (modified) (1 diff)

branches/1.0x/libtransmission/bencode-test.c

@@ -215 +215 @@
     tr_bencFree( &val );
 
+    end = NULL;
+    snprintf( (char*)buf, sizeof( buf ), "d8:completei1e8:intervali1800e12:min intervali1800e5:peers0:e" );
+    err = tr_bencLoad( buf, sizeof( buf ), &val, (char**)&end );
+    check( !err );
+    check( end == buf + strlen( (const char*)buf ) );
+    tr_bencFree( &val );
+
     return 0;
 }

branches/1.0x/libtransmission/bencode.c

@@ -292 +292 @@
             const uint8_t * end;
             uint8_t * str;
-            size_t strlen;
+            size_t str_len;
             int err;
             benc_val_t * node;
 
-            if(( err = tr_bencParseStr( buf, bufend, &end, &str, &strlen )))
+            if(( err = tr_bencParseStr( buf, bufend, &end, &str, &str_len )))
                 return err;
 
@@ -303 +303 @@
                 return TR_ERROR;
 
-            tr_bencInitStr( node, str, strlen, 0 );
+            tr_bencInitStr( node, str, str_len, 0 );
             buf = end;
 
@@ -797 +797 @@
     struct WalkPrint * data = vdata;
     printLeadingSpaces( data );
+    fprintf( data->out, "string:  " );
     for( ii = 0; val->val.s.i > ii; ii++ )
     {
@@ -808 +809 @@
         }
     }
+    fprintf( data->out, "\n" );
 }
 static void

branches/1.0x/libtransmission/tracker.c

@@ -279 +279 @@
     const unsigned char * body = EVBUFFER_DATA( req->input_buffer );
     const int bodylen = EVBUFFER_LENGTH( req->input_buffer );
-    int ret = 1;
-    int i;
-
-    for( i=0; ret && i<bodylen; ++i )
-        if( !tr_bencLoad( body+i, bodylen-1, setme, NULL ) )
-            ret = 0;
-
-    return ret;
+    return tr_bencLoad( body, bodylen, setme, NULL );
 }