diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-09 13:35:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-09 13:35:21 -0500 |
| commit | 49efac5356ca4eea4b7e6ef9bf1160bba25cfcde (patch) | |
| tree | dfb925f69f9b58261b11dbb2fc3b634a9883b955 /bufferevent_pair.c | |
| parent | 2ea15ed0f69badb27b5ea58ffd873b1c2008c5d9 (diff) | |
| parent | f2428a284b61029a59ccf4d41c89db1070594722 (diff) | |
| download | libevent-49efac5356ca4eea4b7e6ef9bf1160bba25cfcde.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Diffstat (limited to 'bufferevent_pair.c')
| -rw-r--r-- | bufferevent_pair.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bufferevent_pair.c b/bufferevent_pair.c index 5e2e2c41..4340f237 100644 --- a/bufferevent_pair.c +++ b/bufferevent_pair.c @@ -302,13 +302,14 @@ struct bufferevent * bufferevent_pair_get_partner(struct bufferevent *bev) { struct bufferevent_pair *bev_p; - struct bufferevent *partner; + struct bufferevent *partner = NULL; bev_p = upcast(bev); if (! bev_p) return NULL; incref_and_lock(bev); - partner = downcast(bev_p->partner); + if (bev_p->partner) + partner = downcast(bev_p->partner); decref_and_unlock(bev); return partner; } |