X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvppinfra%2Fformat.c;h=cb6cb455eaa1249bfc948440ef853d2f0cadb25c;hb=efd7bc2b1c8db160933ed3e9ab3cde0d07aaf863;hp=e2fd84bb08b95308d8d438e70d391ed57dfb4c03;hpb=d05ce97724ed8681e80c32a948564d0163994365;p=vpp.git

diff --git a/src/vppinfra/format.c b/src/vppinfra/format.c
index e2fd84bb08b..cb6cb455eaa 100644
--- a/src/vppinfra/format.c
+++ b/src/vppinfra/format.c
@@ -139,13 +139,13 @@ justify (u8 * s, format_info_t * fi, uword s_len_orig)
       if (n_left > 0)
 	{
 	  vec_insert (s, n_left, i0);
-	  memset (s + i0, fi->pad_char, n_left);
+	  clib_memset (s + i0, fi->pad_char, n_left);
 	  l1 = vec_len (s);
 	}
       if (n_right > 0)
 	{
 	  vec_resize (s, n_right);
-	  memset (s + l1, fi->pad_char, n_right);
+	  clib_memset (s + l1, fi->pad_char, n_right);
 	}
     }
   return s;
@@ -412,6 +412,11 @@ va_format (u8 * s, const char *fmt, va_list * va)
   if (f > g)
     vec_add (s, g, f - g);
 
+#ifdef __COVERITY__
+  if (s == 0)
+    return (u8 *) "liar liar pants on fire s can't be zero!";
+#endif
+
   return s;
 }
 
@@ -422,6 +427,10 @@ format (u8 * s, const char *fmt, ...)
   va_start (va, fmt);
   s = va_format (s, fmt, &va);
   va_end (va);
+#ifdef __COVERITY__
+  if (s == 0)
+    return (u8 *) "liar liar pants on fire s can't be zero!";
+#endif
   return s;
 }