From ef2dfe0aae9b9db44a46e0aa312d9927334d6be8 Mon Sep 17 00:00:00 2001
From: reenoo <reenoo@users.sourceforge.net>
Date: Tue, 13 Apr 2004 18:50:36 +0000
Subject: [PATCH] fix buffer overflow and format string vulnerabilities

---
 server/commands/client_commands.c | 2 +-
 server/parse.c                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/commands/client_commands.c b/server/commands/client_commands.c
index 15e78ce..0cb8d5f 100644
--- a/server/commands/client_commands.c
+++ b/server/commands/client_commands.c
@@ -45,7 +45,7 @@ test_func_func (Client * c, int argc, char **argv)
 
 	for (i = 0; i < argc; i++) {
 		snprintf (str, sizeof(str), "%s:  %i -> %s\n", __FUNCTION__, i, argv[i]);
-		report (RPT_INFO, str);
+		report (RPT_INFO, "%s", str);
 		sock_send_string (c->sock, str);
 	}
 	return 0;
diff --git a/server/parse.c b/server/parse.c
index 8493a6c..7b50963 100644
--- a/server/parse.c
+++ b/server/parse.c
@@ -154,7 +154,7 @@ parse_all_client_messages2 ()
 
 
 				argc++;
-			} while (*p);
+			} while (*p && i < MAX_ARGUMENTS - 1);
 
 			/*debug(RPT_DEBUG, "exiting string scan...");*/