Avoid dereferencing msg.ps_msg if it is NULL. Properly protect agains…

…t a removed current entry in map iterator.
FedeDP · Jul 17, 2019 · 335770c · 335770c
1 parent ff976c9
commit 335770c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Lib/map.c b/Lib/map.c
@@ -304,13 +304,19 @@ map_ret_code map_itr_remove(map_itr_t *itr) {
 const char *map_itr_get_key(const map_itr_t *itr) {
     MOD_RET_ASSERT(itr, NULL);
 
-    return itr->curr->key;
+    if (!itr->removed) {
+        return itr->curr->key;
+    }
+    return NULL;
 }
 
 void *map_itr_get_data(const map_itr_t *itr) {
     MOD_RET_ASSERT(itr, NULL);
 
-    return itr->curr->data;
+    if (!itr->removed) {
+        return itr->curr->data;
+    }
+    return NULL;
 }
 
 map_ret_code map_itr_set_data(const map_itr_t *itr, void *value) {

diff --git a/Lib/modules.c b/Lib/modules.c
@@ -162,7 +162,7 @@ static int recv_events(m_context *c, int timeout) {
 
             if (!msg.is_pubsub || (msg.ps_msg && msg.ps_msg->type != POISON_PILL)) {
                 run_pubsub_cb(mod, &msg);
-            } else if (msg.ps_msg->type == POISON_PILL) {
+            } else if (msg.ps_msg) {
                 MODULE_DEBUG("PoisonPilling '%s'.\n", mod->name);
                 stop(mod, true);
             }