Changeset 6850

Timestamp:

Oct 5, 2008, 10:51:18 PM (13 years ago)

Author:

charles

Message:

fix a null pointer dereference

File:

• trunk/libtransmission/peer-mgr.c (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -1311 +1311 @@
                     tr_pex **       setme_pex )
 {
-    const Torrent *  t = getExistingTorrent( (tr_peerMgr*)manager,
-                                            torrentHash );
-    int              i, peerCount;
-    const tr_peer ** peers;
-    tr_pex *         pex;
-    tr_pex *         walk;
+    int peerCount = 0;
+    const Torrent *  t;
 
     managerLock( manager );
 
-    peers = (const tr_peer **) tr_ptrArrayPeek( t->peers, &peerCount );
-    pex = walk = tr_new( tr_pex, peerCount );
-
-    for( i = 0; i < peerCount; ++i, ++walk )
-    {
-        const tr_peer * peer = peers[i];
-
-        walk->in_addr = peer->in_addr;
-
-        walk->port = peer->port;
-
-        walk->flags = 0;
-        if( peerPrefersCrypto( peer ) ) walk->flags |=
-                ADDED_F_ENCRYPTION_FLAG;
-        if( peer->progress >= 1.0 ) walk->flags |= ADDED_F_SEED_FLAG;
-    }
-
-    assert( ( walk - pex ) == peerCount );
-    qsort( pex, peerCount, sizeof( tr_pex ), tr_pexCompare );
-    *setme_pex = pex;
+    t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
+    if( !t )
+    {
+        *setme_pex = NULL;
+    }
+    else
+    {
+        int i;
+        const tr_peer ** peers = (const tr_peer **) tr_ptrArrayPeek( t->peers, &peerCount );
+        tr_pex * pex = tr_new( tr_pex, peerCount );
+        tr_pex * walk = pex;
+
+        for( i = 0; i < peerCount; ++i, ++walk )
+        {
+            const tr_peer * peer = peers[i];
+            walk->in_addr = peer->in_addr;
+            walk->port = peer->port;
+            walk->flags = 0;
+            if( peerPrefersCrypto( peer ) ) walk->flags |= ADDED_F_ENCRYPTION_FLAG;
+            if( peer->progress >= 1.0 ) walk->flags |= ADDED_F_SEED_FLAG;
+        }
+
+        assert( ( walk - pex ) == peerCount );
+        qsort( pex, peerCount, sizeof( tr_pex ), tr_pexCompare );
+        *setme_pex = pex;
+    }
 
     managerUnlock( manager );
-
     return peerCount;
 }