upstream commit

replace statically-sized arrays in ServerOptions with
dynamic ones managed by xrecallocarray, removing some arbitrary (though
large) limits and saving a bit of memory; "much nicer" markus@

Upstream-ID: 1732720b2f478fe929d6687ac7b0a97ff2efe9d2

1 files changed, 3 insertions, 7 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 69212aaf3..a46628fb1 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.94 2017/10/02 19:33:20 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.95 2017/10/05 15:52:03 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -287,19 +287,15 @@ out:
                         newopts->x = buffer_get_string(&m, NULL); \
         } while (0)
 #define M_CP_STRARRAYOPT(x, nx) do { \
-                for (i = 0; i < newopts->nx; i++) \
-                        newopts->x[i] = buffer_get_string(&m, NULL); \
-        } while (0)
-#define M_CP_STRARRAYOPT_ALLOC(x, nx) do { \
                 newopts->x = newopts->nx == 0 ? \
                     NULL : xcalloc(newopts->nx, sizeof(*newopts->x)); \
-                M_CP_STRARRAYOPT(x, nx); \
+                for (i = 0; i < newopts->nx; i++) \
+                        newopts->x[i] = buffer_get_string(&m, NULL); \
         } while (0)
         /* See comment in servconf.h */
         COPY_MATCH_STRING_OPTS();
 #undef M_CP_STROPT
 #undef M_CP_STRARRAYOPT
-#undef M_CP_STRARRAYOPT_ALLOC
 
         copy_set_server_options(&options, newopts, 1);
         log_change_level(options.log_level);