From: Steven Luong <sluong@cisco.com>
Date: Wed, 3 Nov 2021 23:49:04 +0000 (-0700)
Subject: vppinfra: strstr_s_inline checks string unterminated wrong
X-Git-Tag: v22.06-rc0~308
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=b5a2b05327c1a2bbb23dbb7131cc1be6c0db5e67;p=vpp.git

vppinfra: strstr_s_inline checks string unterminated wrong

When checking whether s2 is unterminated, it uses s1max. It should
use s2max.

Type: fix
Fixes: b0598497afde60146fe8480331c9f96e7a79475a

Signed-off-by: Steven Luong <sluong@cisco.com>
Change-Id: I8a0b8ceebc2dd18402a87274add528c3d085a95a
---

diff --git a/src/vppinfra/string.h b/src/vppinfra/string.h
index 0d2c0655c50..db09c508447 100644
--- a/src/vppinfra/string.h
+++ b/src/vppinfra/string.h
@@ -1395,7 +1395,7 @@ strstr_s_inline (char *s1, rsize_t s1max, const char *s2, rsize_t s2max,
 	clib_c11_violation ("substring NULL");
       if (s1 && s1max && (s1[clib_strnlen (s1, s1max)] != '\0'))
 	clib_c11_violation ("s1 unterminated");
-      if (s2 && s2max && (s2[clib_strnlen (s2, s1max)] != '\0'))
+      if (s2 && s2max && (s2[clib_strnlen (s2, s2max)] != '\0'))
 	clib_c11_violation ("s2 unterminated");
       return EINVAL;
     }