Changeset 10970 for trunk/gtk/makemeta-ui.c

Timestamp:

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

Author:

charles

Message:

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

File:

• trunk/gtk/makemeta-ui.c (modified) (3 diffs)

trunk/gtk/makemeta-ui.c

@@ -18 +18 @@
 #include <libtransmission/transmission.h>
 #include <libtransmission/makemeta.h>
+#include <libtransmission/utils.h> /* tr_formatter_mem_B() */
 
 #include "conf.h"
@@ -68 +69 @@
     GtkDialog * d = GTK_DIALOG( ui->progress_dialog );
     GtkProgressBar * p = GTK_PROGRESS_BAR( ui->progress_bar );
-    const double fraction = (double)b->pieceIndex / b->pieceCount;
-        char * base = g_path_get_basename( b->top );
+    const double fraction = b->pieceCount ? ((double)b->pieceIndex / b->pieceCount) : 0;
+    char * base = g_path_get_basename( b->top );
 
     /* progress label */
@@ -301 +302 @@
                                 buf, builder->fileCount );
         g_string_append( gstr, "; " );
-        tr_strlsize( buf, builder->pieceSize, sizeof( buf ) );
+  
+        tr_formatter_mem_B( buf, builder->pieceSize, sizeof( buf ) );
         g_string_append_printf( gstr, ngettext( "%1$'d Piece @ %2$s",
                                                 "%1$'d Pieces @ %2$s",