rcolebaugh / rpms / openssh

Forked from rpms/openssh 2 years ago
Clone
1d31ef
diff -up openssh-7.4p1/servconf.c.memory-problems openssh-7.4p1/servconf.c
1d31ef
--- openssh-7.4p1/servconf.c.memory-problems	2017-02-09 10:41:42.483123417 +0100
1d31ef
+++ openssh-7.4p1/servconf.c	2017-02-09 10:42:16.392102462 +0100
1d31ef
@@ -2006,6 +2006,8 @@ copy_set_server_options(ServerOptions *d
674526
 		dst->n = src->n; \
674526
 } while (0)
674526
 
674526
+	u_int i;
674526
+
674526
 	M_CP_INTOPT(password_authentication);
674526
 	M_CP_INTOPT(gss_authentication);
1d31ef
 	M_CP_INTOPT(pubkey_authentication);
1d31ef
@@ -2058,8 +2060,10 @@ copy_set_server_options(ServerOptions *d
674526
 } while(0)
674526
 #define M_CP_STRARRAYOPT(n, num_n) do {\
674526
 	if (src->num_n != 0) { \
674526
+		for (i = 0; i < dst->num_n; i++) \
674526
+			free(dst->n[i]); \
674526
 		for (dst->num_n = 0; dst->num_n < src->num_n; dst->num_n++) \
674526
-			dst->n[dst->num_n] = xstrdup(src->n[dst->num_n]); \
674526
+			dst->n[dst->num_n] = src->n[dst->num_n]; \
674526
 	} \
674526
 } while(0)
674526
 
1d31ef
diff -up openssh-7.4p1/sshd.c.memory-problems openssh-7.4p1/sshd.c