Changeset 12095

Timestamp:

Mar 4, 2011, 9:38:04 PM (11 years ago)

Author:

jordan

Message:

(trunk libT) fix possible memory leak in tr-udp's EV_READ handler.

The EV_READ callback allocates a buffer, but then returns without freeing it if recvfrom() returns <= 0. This commit inverts the logic to avoid returning until the buffer's been free()d.

File:

• trunk/libtransmission/tr-udp.c (modified) (1 diff)

trunk/libtransmission/tr-udp.c

@@ -205 +205 @@
     rc = recvfrom(s, buf, 4096 - 1, 0,
                   (struct sockaddr*)&from, &fromlen);
-    if(rc <= 0)
-        return;
-
-    if( buf[0] == 'd' ) {
-        /* DHT packet. */
-        buf[rc] = '\0';
-        tr_dhtCallback(buf, rc, (struct sockaddr*)&from, fromlen, sv);
-    } else {
-        rc = tr_utpPacket(buf, rc, (struct sockaddr*)&from, fromlen, ss);
-        if(!rc)
-            tr_ndbg("UDP", "Unexpected UDP packet");
+    if(rc > 0) {
+        if( buf[0] == 'd' ) {
+            /* DHT packet. */
+            buf[rc] = '\0';
+            tr_dhtCallback(buf, rc, (struct sockaddr*)&from, fromlen, sv);
+        } else {
+            rc = tr_utpPacket(buf, rc, (struct sockaddr*)&from, fromlen, ss);
+            if(!rc)
+                tr_ndbg("UDP", "Unexpected UDP packet");
+        }
     }