Changeset 14542

Timestamp:

Jun 17, 2015, 8:32:33 PM (7 years ago)

Author:

mikedld

Message:

#5456: Fix encrypted communication with libevent 2.1.x

Recent versions of libevent changed the semantics of evbuffer_ptr_set
function in a way that it succeeds if pointer is set right after the end
of the buffer. This caused tr_cryptoEncrypt and tr_cryptoDecrypt to
be called twice for last buffer chunk since no checks for evbuffer_peek
return value were made while it was returning 0 on last loop cycle,
leaving iovec unchanged.

File:

• trunk/libtransmission/peer-io.c (modified) (2 diffs)

trunk/libtransmission/peer-io.c

@@ -1061 +1061 @@
         evbuffer_ptr_set (buf, &pos, 0, EVBUFFER_PTR_SET);
         do {
-            evbuffer_peek (buf, -1, &pos, &iovec, 1);
+            if (evbuffer_peek (buf, -1, &pos, &iovec, 1) != 1)
+              break;
             tr_cryptoEncrypt (&io->crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);
         } while (!evbuffer_ptr_set (buf, &pos, iovec.iov_len, EVBUFFER_PTR_ADD));
@@ -1148 +1149 @@
         evbuffer_ptr_set (outbuf, &pos, old_length, EVBUFFER_PTR_SET);
         do {
-            evbuffer_peek (outbuf, byteCount, &pos, &iovec, 1);
+            if (evbuffer_peek (outbuf, byteCount, &pos, &iovec, 1) != 1)
+              break;
             tr_cryptoDecrypt (&io->crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);
             byteCount -= iovec.iov_len;