From 6841bda3d47eaa988bd8f2d1767dad6fd768b18b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 21 Apr 2023 16:57:23 +0300 Subject: [PATCH 12/12] Fix server_option_next_valid() before server has sent settings It was referring to NULL server_settings Reported by alain_bkr See osdn #47663 Signed-off-by: Marko Lindqvist --- client/options.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/client/options.c b/client/options.c index 5e879f0193..2a065a1e7a 100644 --- a/client/options.c +++ b/client/options.c @@ -4538,14 +4538,18 @@ void handle_server_setting_bitwise static struct server_option * server_option_next_valid(struct server_option *poption) { - const struct server_option *const max = - server_options + server_options_num; + if (server_options != NULL) { + const struct server_option *const max = + server_options + server_options_num; - while (NULL != poption && poption < max && !poption->is_visible) { - poption++; + while (NULL != poption && poption < max && !poption->is_visible) { + poption++; + } + + return (poption < max ? poption : NULL); } - return (poption < max ? poption : NULL); + return NULL; } /************************************************************************//** -- 2.39.2