X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/93ea25f2ec6e99ef5ba3068112eafab265087089..2d23b44169ebf0e91e2262bc33a6ed62e62ae137:/avr/cli.c

diff --git a/avr/cli.c b/avr/cli.c
index f9ffc37..b96ca1b 100644
--- a/avr/cli.c
+++ b/avr/cli.c
@@ -12,16 +12,10 @@
  */
 
 #include "cli.h"
-#include "common.h"
-
-#include <string.h>
+#include "command.h"
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 #include "config.h"
-#include "command.h"
-#include "xmalloc.h"
 #include "debug.h"
 #include "env.h"
 #include "cli_readline.h"
@@ -156,7 +150,12 @@ char *process_macros(char *input, char *output)
 			outp = output;
 		} else {
 			int outputlen = outp - output;
-			outp = xrealloc(output, outputlen);
+			outp = realloc(output, outputlen);
+			if (outp == NULL) {
+				free(output);
+				output = outp;
+				break;
+			}
 			output = outp;
 		}
 
@@ -315,6 +314,10 @@ static int cli_run_command(const char *cmd, uint_fast8_t flag)
 
 		/* find macros in this token and replace them */
 		finaltoken = process_macros(token, finaltoken);
+		if (finaltoken == NULL) {
+			rc = -1;	/* no command at all */
+			break;
+		}
 
 		/* Extract arguments */
 		argc = cli_parse_line(finaltoken, argv);