diff options
| -rw-r--r-- | changes/bug4457 | 1 | ||||
| -rw-r--r-- | src/common/compat_libevent.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug4457 b/changes/bug4457 index d3d9eb3b40..fe7c95ff80 100644 --- a/changes/bug4457 +++ b/changes/bug4457 @@ -5,4 +5,5 @@ bug 4457; workaround for Libevent versions 2.0.1-alpha through 2.0.15-stable. + - Detect failure to initialize Libevent. Better detection for bug 4457. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 3e35e093e4..ddb2da68aa 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -179,6 +179,7 @@ tor_libevent_initialize(void) #ifdef HAVE_EVENT2_EVENT_H { struct event_config *cfg = event_config_new(); + tor_assert(cfg); /* In 0.2.2, we don't use locking at all. Telling Libevent not to try to * turn it on can avoid a needless socketpair() attempt. @@ -193,6 +194,11 @@ tor_libevent_initialize(void) the_event_base = event_init(); #endif + if (!the_event_base) { + log_err(LD_GENERAL, "Unable to initialize Libevent: cannot continue."); + exit(1); + } + #if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD) /* Making this a NOTICE for now so we can link bugs to a libevent versions * or methods better. */ |