From 35fda10dfd9cdfa30b24b0465237406de9faa5ef Mon Sep 17 00:00:00 2001 From: Michael Black Date: Tue, 1 Nov 2016 16:02:15 -0500 Subject: [PATCH] Fixed buffer overflow in rigctl_parse and rotctl_parse --- tests/rigctl_parse.c | 3 ++- tests/rotctl_parse.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index ecbcd2551..cf37c971d 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -121,7 +121,7 @@ static pthread_mutex_t rig_mutex = PTHREAD_MUTEX_INITIALIZER; #ifdef HAVE_LIBREADLINE static char *input_line = (char *)NULL; static char *result = (char *)NULL; -static char *parsed_input[sizeof(char) * 5]; +static char *parsed_input[sizeof(char*) * 5]; static const int have_rl = 1; #ifdef HAVE_READLINE_HISTORY @@ -429,6 +429,7 @@ static int scanfc(FILE *fin, const char *format, void *p) if (errno == EINTR) continue; rig_debug(RIG_DEBUG_ERR, "fscanf: %s\n", strerror(errno)); + rig_debug(RIG_DEBUG_ERR, "fscanf: parsing '%s' with '%s'\n", p, format); } return ret; } while(1); diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c index dec0ea04b..9d8e4e425 100644 --- a/tests/rotctl_parse.c +++ b/tests/rotctl_parse.c @@ -118,7 +118,7 @@ static pthread_mutex_t rot_mutex = PTHREAD_MUTEX_INITIALIZER; #ifdef HAVE_LIBREADLINE static char *input_line = (char *)NULL; static char *result = (char *)NULL; -static char *parsed_input[sizeof(char) * 7]; +static char *parsed_input[sizeof(char*) * 7]; static const int have_rl = 1; #ifdef HAVE_READLINE_HISTORY @@ -331,6 +331,7 @@ static int scanfc(FILE *fin, const char *format, void *p) if (errno == EINTR) continue; rig_debug(RIG_DEBUG_ERR, "fscanf: %s\n", strerror(errno)); + rig_debug(RIG_DEBUG_ERR, "fscanf: parsing '%s' with '%s'\n", p, format); } return ret; } while(1);