Changeset 10091

Timestamp:

Feb 3, 2010, 2:31:12 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #2716 "magnet torrents not being saved after quit" -- fix bencode bug.

Location:

trunk/libtransmission

Files:

• bencode-test.c (modified) (2 diffs)
• bencode.c (modified) (5 diffs)

trunk/libtransmission/bencode-test.c

@@ -11 +11 @@
 #include "utils.h" /* tr_free */
 
-#undef VERBOSE
+/* #define VERBOSE */
 
 static int test = 0;
@@ -171 +171 @@
 #if 0
         fprintf( stderr, "in: [%s]\n", str );
-        fprintf( stderr, "out:\n%s", tr_bencSaveAsJSON( &val, NULL ) );
+        fprintf( stderr, "out:\n%s", tr_bencToStr( &val, TR_FMT_JSON, NULL ) );
 #endif
         check( end == (const uint8_t*)str + len );

trunk/libtransmission/bencode.c

@@ -356 +356 @@
 ***/
 
-/* returns true if the given string length would fit in our string buffer */
-static inline int
-stringFitsInBuffer( const tr_benc * val, int len )
-{
-    return len < (int)sizeof( val->val.s.str.buf );
-}
-
 /* returns true if the benc's string was malloced.
  * this occurs when the string is too long for our string buffer */
@@ -368 +361 @@
 stringIsAlloced( const tr_benc * val )
 {
-    return !stringFitsInBuffer( val, val->val.s.len );
+    return val->val.s.len >= sizeof( val->val.s.str.buf );
 }
 
@@ -578 +571 @@
 tr_bencInitRaw( tr_benc * val, const void * src, size_t byteCount )
 {
+    char * setme;
     tr_bencInit( val, TR_TYPE_STR );
 
-    if( stringFitsInBuffer( val, val->val.s.len = byteCount ))
-        memcpy( val->val.s.str.buf, src, byteCount );
+    /* There's no way in benc notation to distinguish between
+     * zero-terminated strings and raw byte arrays.
+     * Because of this, tr_bencMergeDicts() and tr_bencListCopy()
+     * don't know whether or not a TR_TYPE_STR node needs a '\0'.
+     * Append one, een to the raw arrays, just to be safe. */
+
+    if( byteCount < sizeof( val->val.s.str.buf ) )
+        setme = val->val.s.str.buf;
     else
-        val->val.s.str.ptr = tr_memdup( src, byteCount );
+        setme = val->val.s.str.ptr = tr_new( char, byteCount + 1 );
+
+    memcpy( setme, src, byteCount );
+    setme[byteCount] = '\0';
+    val->val.s.len = byteCount;
 }
 
@@ -589 +593 @@
 tr_bencInitStr( tr_benc * val, const void * str, int len )
 {
-    tr_bencInit( val, TR_TYPE_STR );
-
     if( str == NULL )
         len = 0;
@@ -596 +598 @@
         len = strlen( str );
 
-    if( stringFitsInBuffer( val, val->val.s.len = len )) {
-        memcpy( val->val.s.str.buf, str, len );
-        val->val.s.str.buf[len] = '\0';
-    } else
-        val->val.s.str.ptr = tr_strndup( str, len );
+    tr_bencInitRaw( val, str, len );
 }