Changeset 7825

Timestamp:

Feb 4, 2009, 5:38:40 PM (12 years ago)

Author:

charles

Message:

(trunk libT) hack on the r7824 crasher reported by Biiaru and m1b. This probably won't fix it but it should crash in a more informative way :)

File:

• trunk/libtransmission/tracker.c (modified) (5 diffs)

trunk/libtransmission/tracker.c

@@ -721 +721 @@
     TR_REQ_PAUSED,     /* BEP 21 */
     TR_REQ_REANNOUNCE,
-    TR_REQ_SCRAPE
+    TR_REQ_SCRAPE,
+    TR_NUM_REQ_TYPES
 };
 
@@ -872 +873 @@
 {
     struct tr_tracker_request * req = vreq;
-    tr_tracker * t = findTracker( req->session, req->torrentId );
-
-    if( t )
+    tr_tracker * t;
+
+    assert( req != NULL );
+    assert( tr_isSession( req->session ) );
+    assert( req->torrentId >= 0 );
+    assert( req->reqtype >= 0 );
+    assert( req->reqtype < TR_NUM_REQ_TYPES );
+
+    t = findTracker( req->session, req->torrentId );
+
+    if( t != NULL )
     {
         const time_t now = time( NULL );
@@ -891 +900 @@
     }
 
+    assert( req->session->tracker != NULL );
     ++req->session->tracker->runningCount;
 
@@ -905 +915 @@
                tr_tracker * tracker )
 {
-    struct tr_tracker_request * req = createScrape( session, tracker );
+    struct tr_tracker_request * req;
+    assert( tr_isSession( session ) );
+
+    req = createScrape( session, tracker );
     tr_runInEventThread( session, invokeRequest, req );
 }
@@ -914 +927 @@
                 int          reqtype )
 {
-    struct tr_tracker_request * req = createRequest( session, tracker, reqtype );
+    struct tr_tracker_request * req;
+    assert( tr_isSession( session ) );
+
+    req = createRequest( session, tracker, reqtype );
     tr_runInEventThread( session, invokeRequest, req );
 }