Changeset 7144

Timestamp:

Nov 23, 2008, 5:40:35 PM (12 years ago)

Author:

charles

Message:

(1.4x libT) backport #1476: crash on exit when stats window is open

File:

• branches/1.4x/libtransmission/stats.c (modified) (6 diffs)

branches/1.4x/libtransmission/stats.c

@@ -11 +11 @@
  */
 
-#include <assert.h>
-
 #include "transmission.h"
 #include "bencode.h"
@@ -22 +20 @@
 ****
 ***/
+
+static struct tr_session_stats STATS_INIT = { 0.0f, 0, 0, 0, 0, 0 };
 
 struct tr_stats_handle
@@ -120 +120 @@
 tr_statsClose( tr_handle * handle )
 {
-    tr_session_stats cumulative;
+    tr_session_stats cumulative = STATS_INIT;
 
     tr_sessionGetCumulativeStats( handle, &cumulative );
@@ -132 +132 @@
 getStats( const tr_handle * handle )
 {
-    return handle->sessionStats;
+    return handle ? handle->sessionStats : NULL;
 }
 
@@ -164 +164 @@
 {
     const struct tr_stats_handle * stats = getStats( handle );
-
-    assert( stats );
-    *setme = stats->single;
-    setme->secondsActive = time( NULL ) - stats->startTime;
-    updateRatio( setme );
+    if( stats )
+    {
+        *setme = stats->single;
+        setme->secondsActive = time( NULL ) - stats->startTime;
+        updateRatio( setme );
+    }
 }
 
@@ -176 +177 @@
 {
     const struct tr_stats_handle * stats = getStats( handle );
-    tr_session_stats               current;
-
-    assert( stats );
-    tr_sessionGetStats( handle, &current );
-    addStats( setme, &stats->old, &current );
+    tr_session_stats current = STATS_INIT;
+
+    if( stats )
+    {
+        tr_sessionGetStats( handle, &current );
+        addStats( setme, &stats->old, &current );
+    }
 }