buffer: fix incorrect unlock of the buffer mutex (for deferred callbacks)

TSAN reports:
  WARNING: ThreadSanitizer: unlock of an unlocked mutex (or by a wrong thread) (pid=17111)
      #0 pthread_mutex_unlock /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:3621 (libtsan.so.0+0x00000003b71c)
      #1 evbuffer_add <null> (libevent_core-2.2.so.1+0x00000000ddb6)
      ...

    Mutex M392 (0x7b0c00000f00) created at:
      #0 pthread_mutex_init /build/gcc/src/gcc/libsanitizer/tsan/tsan_interceptors.cc:1117 (libtsan.so.0+0x0000000291af)
      #1 <null> <null> (libevent_pthreads-2.2.so.1+0x000000000d46)
      ...

$ addr2line -e /lib/libevent_core-2.2.so.1 0x00000000ddb6
/src/libevent/buffer.c:1815 (discriminator 1)

Introduced-in: ae2b84b2575be93d0aebba5c0b78453836f89f3c ("Replace
deferred_cbs with event_callback-based implementation.")

(cherry picked from commit 93913da1c4a528e0a832dc8dc163fa30f3e580d4)
This commit is contained in:
Azat Khuzhin 2018-02-12 19:43:13 +03:00 committed by Azat Khuzhin
parent 6200b821eb
commit 2b4d127dbe
No known key found for this signature in database
GPG Key ID: B86086848EF8686D

View File

@ -522,8 +522,8 @@ evbuffer_invoke_callbacks_(struct evbuffer *buffer)
evbuffer_incref_and_lock_(buffer); evbuffer_incref_and_lock_(buffer);
if (buffer->parent) if (buffer->parent)
bufferevent_incref_(buffer->parent); bufferevent_incref_(buffer->parent);
EVBUFFER_UNLOCK(buffer);
} }
EVBUFFER_UNLOCK(buffer);
} }
evbuffer_run_callbacks(buffer, 0); evbuffer_run_callbacks(buffer, 0);