upstream commit

Fix PermitOpen crash; spotted by benno@, ok dtucker@ deraadt@

Upstream-ID: c2cc84ffac070d2e1ff76182c70ca230a387983c

1 files changed, 7 insertions, 1 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 287af0667..69212aaf3 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.93 2017/09/12 06:32:07 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.94 2017/10/02 19:33:20 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -290,10 +290,16 @@ out:
                 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); \
+        } 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);