Merge pull request #50 from CESNET/unirec_segv_duplicated_fields

Unirec output: fixed segfault when duplicated field mapping is present
CESNET · Oct 18, 2021 · 47ce88e · 47ce88e
2 parents 259e783 + ac9689d
commit 47ce88e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/extra_plugins/output/unirec/src/map.c b/extra_plugins/output/unirec/src/map.c
@@ -480,9 +480,9 @@ map_sort_fn(const void *p1, const void *p2)
         ipfix2 = ipfix2->next;
     }
 
-    if (ipfix1->next) {
+    if (ipfix1 && ipfix1->next) {
         return -1;
-    } else if (ipfix2->next) {
+    } else if (ipfix2 && ipfix2->next) {
         return 1;
     }
 
@@ -585,7 +585,7 @@ map_load(map_t *map, const char *file)
 
         // Collision detected!
         snprintf(map->err_buffer, ERR_SIZE, "The IPFIX IE '%s' (PEN %" PRIu32 ", ID %" PRIu16 ") "
-            "is mapped to multiple different UniRec fields ('%s' and '%s')",
+            "is mapped to multiple UniRec fields ('%s' and '%s')",
             rec_now->ipfix.def->name, rec_now->ipfix.en, rec_now->ipfix.id,
             rec_now->unirec.name, rec_prev->unirec.name);
         map_clear(map);