diff options
| -rw-r--r-- | libglusterfs/src/dict.c | 4 | ||||
| -rw-r--r-- | libglusterfs/src/event-poll.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c index aa893845659..aedb7c9660c 100644 --- a/libglusterfs/src/dict.c +++ b/libglusterfs/src/dict.c @@ -2240,7 +2240,9 @@ _dict_modify_flag (dict_t *this, char *key, int flag, int op) return 0; err: - UNLOCK (&this->lock); + if (key && this) + UNLOCK (&this->lock); + if (pair) { if (pair->key) free(pair->key); diff --git a/libglusterfs/src/event-poll.c b/libglusterfs/src/event-poll.c index 797649f11b8..283e2861b2b 100644 --- a/libglusterfs/src/event-poll.c +++ b/libglusterfs/src/event-poll.c @@ -429,6 +429,10 @@ event_dispatch_poll_resize (struct event_pool *event_pool, event_pool->evcache = ufds; } + if (ufds == NULL) { + goto unlock; + } + for (i = 0; i < event_pool->used; i++) { ufds[i].fd = event_pool->reg[i].fd; ufds[i].events = event_pool->reg[i].events; |