vppinfra: do not crash if format string is null

[vpp.git] / src / vlibapi / api_shared.c

diff --git a/src/vlibapi/api_shared.c b/src/vlibapi/api_shared.c
index caad6e5..ec74b5f 100644 (file)
--- a/src/vlibapi/api_shared.c
+++ b/src/vlibapi/api_shared.c
@@ -30,6 +30,7 @@
 #include <vlib/unix/unix.h>
 #include <vlibapi/api.h>
 #include <vppinfra/elog.h>
+#include <vppinfra/callback.h>
 
 /* *INDENT-OFF* */
 api_main_t api_global_main =
@@ -453,7 +454,7 @@ msg_handler_internal (api_main_t * am,
        u32 c;
       } *ed;
       ed = ELOG_DATA (am->elog_main, e);
-      if (id < vec_len (am->msg_names))
+      if (id < vec_len (am->msg_names) && am->msg_names[id])
        ed->c = elog_string (am->elog_main, (char *) am->msg_names[id]);
       else
        ed->c = elog_string (am->elog_main, "BOGUS");
@@ -493,7 +494,15 @@ msg_handler_internal (api_main_t * am,
              (*endian_fp) (the_msg);
            }
 
+         if (PREDICT_FALSE (vec_len (am->perf_counter_cbs) != 0))
+           clib_call_callbacks (am->perf_counter_cbs, am, id,
+                                0 /* before */ );
+
          (*am->msg_handlers[id]) (the_msg);
+
+         if (PREDICT_FALSE (vec_len (am->perf_counter_cbs) != 0))
+           clib_call_callbacks (am->perf_counter_cbs, am, id,
+                                1 /* after */ );
          if (!am->is_mp_safe[id])
            vl_msg_api_barrier_release ();
        }
@@ -528,7 +537,7 @@ msg_handler_internal (api_main_t * am,
        u32 c;
       } *ed;
       ed = ELOG_DATA (am->elog_main, e);
-      if (id < vec_len (am->msg_names))
+      if (id < vec_len (am->msg_names) && am->msg_names[id])
        {
          ed->c = elog_string (am->elog_main, (char *) am->msg_names[id]);
          ed->barrier = !am->is_mp_safe[id];
@@ -570,7 +579,7 @@ vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
        u32 c;
       } *ed;
       ed = ELOG_DATA (am->elog_main, e);
-      if (id < vec_len (am->msg_names))
+      if (id < vec_len (am->msg_names) && am->msg_names[id])
        ed->c = elog_string (am->elog_main, (char *) am->msg_names[id]);
       else
        ed->c = elog_string (am->elog_main, "BOGUS");
@@ -620,8 +629,13 @@ vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
          endian_fp = am->msg_endian_handlers[id];
          (*endian_fp) (the_msg);
        }
+      if (PREDICT_FALSE (vec_len (am->perf_counter_cbs) != 0))
+       clib_call_callbacks (am->perf_counter_cbs, am, id, 0 /* before */ );
 
       (*handler) (the_msg, vm, node);
+
+      if (PREDICT_FALSE (vec_len (am->perf_counter_cbs) != 0))
+       clib_call_callbacks (am->perf_counter_cbs, am, id, 1 /* after */ );
       if (is_private)
        {
          am->vlib_rp = old_vlib_rp;
@@ -664,7 +678,7 @@ vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
        u32 c;
       } *ed;
       ed = ELOG_DATA (am->elog_main, e);
-      if (id < vec_len (am->msg_names))
+      if (id < vec_len (am->msg_names) && am->msg_names[id])
        ed->c = elog_string (am->elog_main, (char *) am->msg_names[id]);
       else
        ed->c = elog_string (am->elog_main, "BOGUS");