Changeset 4883

Timestamp:

Jan 31, 2008, 3:20:44 PM (14 years ago)

Author:

charles

Message:

(1.0x) more graceful handling of bad inputs to tr_bencFree(), tr_bencSave(), and tr_bencPrint().

Location:

branches/1.0x/libtransmission

Files:

• bencode-test.c (modified) (5 diffs)
• bencode.c (modified) (6 diffs)
• bencode.h (modified) (1 diff)

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

@@ -152 +152 @@
     err = tr_bencParse( buf, buf + sizeof( buf ), &val, &end );
     check( !err );
-    check( tr_bencIsInt( &val ) );
     check( tr_bencGetInt( &val ) == 64 );
     check( end == buf + 4 );
@@ -160 +159 @@
     err = tr_bencParse( buf, buf + sizeof( buf ), &val, &end );
     check( !err );
-    check( tr_bencIsList( &val ) );
     check( end == buf + strlen( (char*)buf ) );
     check( val.val.l.count == 3 );
@@ -205 +203 @@
     check( !err );
     check( end == buf + strlen( (const char*)buf ) );
-    check( tr_bencIsList( &val ) );
     check(( child = tr_bencListGetNthChild( &val, 0 )));
-    check( tr_bencIsList( child ) );
     check(( child2 = tr_bencListGetNthChild( child, 0 )));
-    check( tr_bencIsDict( child2 ) );
     saved = tr_bencSave( &val, &len );
     check( !strcmp( saved, "lld1:ai64e1:bi32eeee" ) );
@@ -217 +212 @@
     end = NULL;
     snprintf( (char*)buf, sizeof( buf ), "d8:completei1e8:intervali1800e12:min intervali1800e5:peers0:e" );
-    err = tr_bencLoad( buf, sizeof( buf ), &val, (char**)&end );
+    err = tr_bencParse( buf, buf+sizeof( buf ), &val, &end );
     check( !err );
     check( end == buf + strlen( (const char*)buf ) );
@@ -246 +241 @@
     err = tr_bencParse( in, in+(depth*2), &val, &end );
     check( !err );
-    check( tr_bencIsList( &val ) );
     check( end == in+(depth*2) );
     saved = tr_bencSave( &val, &len );

branches/1.0x/libtransmission/bencode.c

@@ -41 +41 @@
 **/
 
-int
+static int
 tr_bencIsInt( const benc_val_t * val )
 {
@@ -47 +47 @@
 }
 
-int
-tr_bencIsString( const benc_val_t * val )
-{
-    return val!=NULL && val->type==TYPE_STR;
-}
-
-int
+static int
 tr_bencIsList( const benc_val_t * val )
 {
@@ -59 +53 @@
 }
 
-int
+static int
 tr_bencIsDict( const benc_val_t * val )
 {
@@ -581 +575 @@
 nodeNew( const benc_val_t * val )
 {
-    switch( val->type )
-    {
-        case TYPE_INT:
-        case TYPE_STR:
-            return nodeNewLeaf( val );
-            break;
-        case TYPE_LIST:
-            return nodeNewList( val );
-            break;
-        case TYPE_DICT:
-            return nodeNewDict( val );
-            break;
-    }
-
-    assert( 0 && "invalid type!" );
-    return NULL;
-}
-
-typedef void (*BencNodeWalkFunc)( const benc_val_t * val, void * user_data );
+    struct SaveNode * node;
+
+    if( val->type == TYPE_LIST )
+        node = nodeNewList( val );
+    else if( val->type == TYPE_DICT )
+        node = nodeNewDict( val );
+    else
+        node = nodeNewLeaf( val );
+
+    return node;
+}
+
+typedef void (*BencWalkFunc)( const benc_val_t * val, void * user_data );
 
 struct WalkFuncs
 {
-    BencNodeWalkFunc intFunc;
-    BencNodeWalkFunc stringFunc;
-    BencNodeWalkFunc dictBeginFunc;
-    BencNodeWalkFunc listBeginFunc;
-    BencNodeWalkFunc containerEndFunc;
+    BencWalkFunc intFunc;
+    BencWalkFunc stringFunc;
+    BencWalkFunc dictBeginFunc;
+    BencWalkFunc listBeginFunc;
+    BencWalkFunc containerEndFunc;
 };
 
@@ -673 +661 @@
 
             default:
-                assert( 0 && "invalid type!" );
+                /* did caller give us an uninitialized val? */
+                tr_err( "Invalid benc type %d", val->type );
+                break;
         }
     }
@@ -685 +675 @@
 
 static void
-saveIntFunc( const benc_val_t * val, void * buf )
-{
-    evbuffer_add_printf( buf, "i%"PRId64"e", tr_bencGetInt(val) );
-}
-static void
-saveStringFunc( const benc_val_t * val, void * user_data )
-{
-    struct evbuffer * out = user_data;
-    evbuffer_add_printf( out, "%i:", val->val.s.i );
-    evbuffer_add( out, val->val.s.s, val->val.s.i );
-}
-static void
-saveDictBeginFunc( const benc_val_t * val UNUSED, void * buf )
-{
-    evbuffer_add_printf( buf, "d" );
-}
-static void
-saveListBeginFunc( const benc_val_t * val UNUSED, void * buf )
-{
-    evbuffer_add_printf( buf, "l" );
-}
-static void
-saveContainerEndFunc( const benc_val_t * val UNUSED, void * buf )
-{
-    evbuffer_add_printf( buf, "e" );
+saveIntFunc( const benc_val_t * val, void * evbuf )
+{
+    evbuffer_add_printf( evbuf, "i%"PRId64"e", tr_bencGetInt(val) );
+}
+static void
+saveStringFunc( const benc_val_t * val, void * vevbuf )
+{
+    struct evbuffer * evbuf = vevbuf;
+    evbuffer_add_printf( evbuf, "%i:", val->val.s.i );
+    evbuffer_add( evbuf, val->val.s.s, val->val.s.i );
+}
+static void
+saveDictBeginFunc( const benc_val_t * val UNUSED, void * evbuf )
+{
+    evbuffer_add_printf( evbuf, "d" );
+}
+static void
+saveListBeginFunc( const benc_val_t * val UNUSED, void * evbuf )
+{
+    evbuffer_add_printf( evbuf, "l" );
+}
+static void
+saveContainerEndFunc( const benc_val_t * val UNUSED, void * evbuf )
+{
+    evbuffer_add_printf( evbuf, "e" );
 }
 char*

branches/1.0x/libtransmission/bencode.h

@@ -119 +119 @@
 **/
 
-int tr_bencIsInt( const benc_val_t * val );
-int tr_bencIsList( const benc_val_t * val );
-int tr_bencIsDict( const benc_val_t * val );
-int tr_bencIsString( const benc_val_t * val );
-
 benc_val_t* tr_bencListGetNthChild( benc_val_t * val, int i );