Changeset 10971 for branches

Timestamp:

Jul 7, 2010, 10:50:22 PM (12 years ago)

Author:

charles

Message:

(2.0x T) #3404 "crash when creating a .torrent containing empty content" -- fixed

Location:

branches/2.0x

Files:

• gtk/makemeta-ui.c (modified) (1 diff)
• libtransmission/makemeta.c (modified) (1 diff)
• libtransmission/makemeta.h (modified) (1 diff)

branches/2.0x/gtk/makemeta-ui.c

@@ -68 +68 @@
     GtkDialog * d = GTK_DIALOG( ui->progress_dialog );
     GtkProgressBar * p = GTK_PROGRESS_BAR( ui->progress_bar );
-    const double fraction = (double)b->pieceIndex / b->pieceCount;
+    const double fraction = b->pieceCount ? ((double)b->pieceIndex / b->pieceCount) : 0;
         char * base = g_path_get_basename( b->top );
 

branches/2.0x/libtransmission/makemeta.c

@@ -390 +390 @@
     tr_bencInitDict( &top, 6 );
 
+    if( !builder->fileCount || !builder->totalSize ||
+        !builder->pieceSize || !builder->pieceCount )
+    {
+        builder->errfile[0] = '\0';
+        builder->my_errno = ENOENT;
+        builder->result = TR_MAKEMETA_IO_READ;
+        builder->isDone = TRUE;
+    }
+
     if( !builder->result && builder->trackerCount )
     {

branches/2.0x/libtransmission/makemeta.h

@@ -30 +30 @@
     TR_MAKEMETA_URL,
     TR_MAKEMETA_CANCELLED,
-    TR_MAKEMETA_IO_READ,   /* see builder.errfile, builder.errno */
-    TR_MAKEMETA_IO_WRITE   /* see builder.errfile, builder.errno */
+    TR_MAKEMETA_IO_READ,   /* see builder.errfile, builder.my_errno */
+    TR_MAKEMETA_IO_WRITE   /* see builder.errfile, builder.my_errno */
 }
 tr_metainfo_builder_err;