Changeset 7657

Timestamp:

Jan 10, 2009, 10:56:26 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #1634: better utf8 validation of metainfo "files" field

File:

• trunk/libtransmission/metainfo.c (modified) (2 diffs)

trunk/libtransmission/metainfo.c

@@ -153 +153 @@
         }
 
-        *setme = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
+        *setme = tr_utf8clean( (char*)EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ), NULL );
         /* fprintf( stderr, "[%s]\n", *setme ); */
         tr_releaseBuffer( buf );
@@ -423 +423 @@
 
     /* files */
-    if( ( str =
-             parseFiles( inf,
-                        tr_bencDictFind( beInfo,
-                                         "files" ),
-                        tr_bencDictFind( beInfo, "length" ) ) ) )
+    if( ( str = parseFiles( inf, tr_bencDictFind( beInfo, "files" ),
+                                 tr_bencDictFind( beInfo, "length" ) ) ) )
         return str;
     if( !inf->fileCount || !inf->totalSize )