From ef8b97942d8d5cec956b75b6254e18034914e80d Mon Sep 17 00:00:00 2001 From: lonkaars Date: Wed, 29 Jun 2022 10:35:23 +0200 Subject: fix buffer overrun in logs --- client/i18n/en_us.h | 2 ++ client/setup.c | 2 +- client/strings.c | 2 ++ client/ui_dirc.c | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/i18n/en_us.h b/client/i18n/en_us.h index 2a24c15..e8e8c14 100644 --- a/client/i18n/en_us.h +++ b/client/i18n/en_us.h @@ -59,6 +59,7 @@ #define W2_UI_ERROR_INT_W2_E_WARN_SERIAL_NOISY "W2_E_WARN_SERIAL_NOISY" #define W2_UI_ERROR_INT_W2_E_WARN_MODE_HISTORY_BUFFER_IOB "W2_E_WARN_MODE_HISTORY_BUFFER_IOB" #define W2_UI_ERROR_INT_W2_E_WARN_PING_TIMEOUT "W2_E_WARN_PING_TIMEOUT" +#define W2_UI_ERROR_INT_W2_E_INFO_ORDER_ARRIVED "W2_E_INFO_ORDER_ARRIVED" #define W2_UI_ERROR_USR_W2_E_UNKNOWN "unknown error code" #define W2_UI_ERROR_USR_W2_E_CRIT_CONN_LOST "connection to robot lost" @@ -77,6 +78,7 @@ #define W2_UI_ERROR_USR_W2_E_WARN_SERIAL_NOISY "invalid serial data received (noisy channel / check connection?)" #define W2_UI_ERROR_USR_W2_E_WARN_MODE_HISTORY_BUFFER_IOB "mode history buffer index out of bounds" #define W2_UI_ERROR_USR_W2_E_WARN_PING_TIMEOUT "ping timed out" +#define W2_UI_ERROR_USR_W2_E_INFO_ORDER_ARRIVED "arrived at order location" #define W2_UI_ORDER_CMD_HELP "help" #define W2_UI_ORDER_CMD_START "start" diff --git a/client/setup.c b/client/setup.c index 43ed135..56c131c 100644 --- a/client/setup.c +++ b/client/setup.c @@ -45,7 +45,7 @@ void w2_client_setup(int argc, char **argv) { g_w2_ui_height = getmaxy(g_w2_ui_win); g_w2_ui_pad_tabbar = newpad(1, g_w2_ui_width); - g_w2_ui_pad_body = newpad(g_w2_ui_height - 5, g_w2_ui_width); + g_w2_ui_pad_body = newpad(0x1000, g_w2_ui_width); g_w2_ui_pad_statusbar = newpad(2, g_w2_ui_width); g_w2_ui_pad_seperator = newpad(1, g_w2_ui_width + 1); scrollok(g_w2_ui_pad_body, true); diff --git a/client/strings.c b/client/strings.c index 1354653..29ca725 100644 --- a/client/strings.c +++ b/client/strings.c @@ -58,6 +58,7 @@ void w2_strings_errors_internal() { g_w2_error_internal_strings[W2_E_WARN_MODE_HISTORY_BUFFER_IOB] = W2_UI_ERROR_INT_W2_E_WARN_MODE_HISTORY_BUFFER_IOB; g_w2_error_internal_strings[W2_E_WARN_PING_TIMEOUT] = W2_UI_ERROR_INT_W2_E_WARN_PING_TIMEOUT; + g_w2_error_internal_strings[W2_E_INFO_ORDER_ARRIVED] = W2_UI_ERROR_INT_W2_E_INFO_ORDER_ARRIVED; } void w2_strings_errors_user() { @@ -82,6 +83,7 @@ void w2_strings_errors_user() { g_w2_error_user_strings[W2_E_WARN_MODE_HISTORY_BUFFER_IOB] = W2_UI_ERROR_USR_W2_E_WARN_MODE_HISTORY_BUFFER_IOB; g_w2_error_user_strings[W2_E_WARN_PING_TIMEOUT] = W2_UI_ERROR_USR_W2_E_WARN_PING_TIMEOUT; + g_w2_error_user_strings[W2_E_INFO_ORDER_ARRIVED] = W2_UI_ERROR_USR_W2_E_INFO_ORDER_ARRIVED; } void w2_strings_init() { diff --git a/client/ui_dirc.c b/client/ui_dirc.c index 4e864d5..58e3576 100644 --- a/client/ui_dirc.c +++ b/client/ui_dirc.c @@ -48,7 +48,9 @@ int w2_avg(int *samples, unsigned int sample_count) { W2_DIRC_MOTOR_DRIVER(l); W2_DIRC_MOTOR_DRIVER(r); -void w2_ui_dirc_init() { w2_send_mode(W2_M_DIRC); } +void w2_ui_dirc_init() { + return; +} void w2_ui_bar_graph(unsigned int y, unsigned int x, unsigned int width, double value) { char temp[width]; -- cgit v1.2.3