Changeset 6124

Timestamp:

Jun 10, 2008, 7:25:18 PM (14 years ago)

Author:

charles

Message:

(libT) add NULL pointer checks to tr_torrentStart(), tr_torrentStop()

Location:

trunk/libtransmission

Files:

• rpc-server.c (modified) (1 diff)
• torrent.c (modified) (3 diffs)

trunk/libtransmission/rpc-server.c

@@ -116 +116 @@
 
     /* set a timer for the next pulse */
-    if( EVBUFFER_LENGTH( server->in ) || EVBUFFER_LENGTH( server->out ) ) {
+    if( EVBUFFER_LENGTH( server->in ) || EVBUFFER_LENGTH( server->out ) )
         interval = BUSY_INTERVAL_MSEC;
-    } else if( now - server->lastRequestTime < 300 ) {
+    else if( now - server->lastRequestTime < 300 )
         interval = IDLE_INTERVAL_MSEC;
-    } else {
+    else
         interval = UNUSED_INTERVAL_MSEC;
-    }
     tv = tr_timevalMsec( interval );
     evtimer_add( &server->timer, &tv );

trunk/libtransmission/torrent.c

@@ -1038 +1038 @@
 tr_torrentStart( tr_torrent * tor )
 {
-    torrentStart( tor, TRUE );
+    if( tor )
+        torrentStart( tor, TRUE );
 }
 
@@ -1087 +1088 @@
 tr_torrentStop( tr_torrent * tor )
 {
-    tr_globalLock( tor->handle );
-
-    tor->isRunning = 0;
-    if( !tor->isDeleting )
-        tr_torrentSaveResume( tor );
-    tr_runInEventThread( tor->handle, stopTorrent, tor );
-
-    tr_globalUnlock( tor->handle );
+    if( tor )
+    {
+        tr_globalLock( tor->handle );
+
+        tor->isRunning = 0;
+        if( !tor->isDeleting )
+            tr_torrentSaveResume( tor );
+        tr_runInEventThread( tor->handle, stopTorrent, tor );
+
+        tr_globalUnlock( tor->handle );
+    }
 }
 
@@ -1114 +1118 @@
 tr_torrentFree( tr_torrent * tor )
 {
-    if( tor != NULL )
+    if( tor )
     {
         tr_handle * handle = tor->handle;