Merge pull request #2620 from pacovn/PVS-Studio_null_check_2

bgpd lib ospfd pimd ripngd: null chk (PVS-Studio)

1 files changed, 9 insertions, 7 deletions

diff --git a/lib/vty.c b/lib/vty.c
index e9d1f2e323..073092dfb6 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -479,6 +479,8 @@ static int vty_command(struct vty *vty, char *buf)
 	const char *protocolname;
 	char *cp = NULL;
 
+	assert(vty);
+
 	/*
 	 * Log non empty command lines
 	 */
@@ -496,13 +498,13 @@ static int vty_command(struct vty *vty, char *buf)
 
 		/* format the base vty info */
 		snprintf(vty_str, sizeof(vty_str), "vty[??]@%s", vty->address);
-		if (vty)
-			for (i = 0; i < vector_active(vtyvec); i++)
-				if (vty == vector_slot(vtyvec, i)) {
-					snprintf(vty_str, sizeof(vty_str),
-						 "vty[%d]@%s", i, vty->address);
-					break;
-				}
+
+		for (i = 0; i < vector_active(vtyvec); i++)
+			if (vty == vector_slot(vtyvec, i)) {
+				snprintf(vty_str, sizeof(vty_str), "vty[%d]@%s",
+					 i, vty->address);
+				break;
+			}
 
 		/* format the prompt */
 		snprintf(prompt_str, sizeof(prompt_str), cmd_prompt(vty->node),