Changeset 8720

Timestamp:

Jun 20, 2009, 12:39:30 AM (13 years ago)

Author:

charles

Message:

(trunk libtransmission) #2227: tr_metaInfoBuilderCreate(topFile) creates invalid .torrent files when topFile ends with a '/'

File:

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

trunk/libtransmission/makemeta.c

@@ -297 +297 @@
 {
     const char * pch, *prev;
-    const size_t topLen = strlen( topFile ) + 1; /* +1 for '/' */
+    size_t       topLen;
     int          n;
 
@@ -303 +303 @@
     tr_bencInitInt( uninitialized_length, file->size );
 
-    /* the path list */
+    /* how much of file->filename to walk past */
+    topLen = strlen( topFile );
+    if( topLen>0 && topFile[topLen-1]!=TR_PATH_DELIMITER )
+        ++topLen; /* +1 for the path delimiter */
+
+    /* build the path list */
     n = 1;
     for( pch = file->filename + topLen; *pch; ++pch )