Просмотр исходного кода

Fixed segfault in argument processing. Thanks to Christoph Schell (#1742066)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1757 f882894a-f735-0410-b71e-b25c423dba1c
Matthias Eble 18 лет назад
Родитель
Сommit
c134205981
2 измененных файлов с 9 добавлено и 4 удалено
  1. 1 0
      THANKS.in
  2. 8 4
      plugins/check_smtp.c

+ 1 - 0
THANKS.in

@@ -221,3 +221,4 @@ Emil Michles
 Ask Bjoern Hansen
 Daniel Bimschas
 Aurelien Bompard
+Christoph Schell

+ 8 - 4
plugins/check_smtp.c

@@ -582,22 +582,26 @@ process_arguments (int argc, char **argv)
 			break;
 		case 'C':									/* commands  */
 			if (ncommands >= command_size) {
-				commands = realloc (commands, command_size+8);
+				command_size+=8;
+				commands = realloc (commands, sizeof(char *) * command_size);
 				if (commands == NULL)
 					die (STATE_UNKNOWN,
 					     _("Could not realloc() units [%d]\n"), ncommands);
 			}
-			commands[ncommands] = optarg;
+			commands[ncommands] = (char *) malloc (sizeof(char) * 255);
+			strncpy (commands[ncommands], optarg, 255);
 			ncommands++;
 			break;
 		case 'R':									/* server responses */
 			if (nresponses >= response_size) {
-				responses = realloc (responses, response_size+8);
+				response_size += 8;
+				responses = realloc (responses, sizeof(char *) * response_size);
 				if (responses == NULL)
 					die (STATE_UNKNOWN,
 					     _("Could not realloc() units [%d]\n"), nresponses);
 			}
-			responses[nresponses] = optarg;
+			responses[nresponses] = (char *) malloc (sizeof(char) * 255);
+			strncpy (responses[nresponses], optarg, 255);
 			nresponses++;
 			break;
 		case 'c':									/* critical time threshold */