Attachment 2414 Details for Bug 2208 – proposed fix

[patch] proposed fix

memleak.diff (text/plain), 1.46 KB, created by Arthur Mesh on 2014-03-04 11:00:46 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Arthur Mesh

Created: 2014-03-04 11:00:46 AEDT

Size: 1.46 KB

patch

obsolete

>--- servconf.c.old	2014-03-03 13:24:16.000000000 -0800
>+++ servconf.c	2014-03-03 13:54:19.000000000 -0800
>@@ -1951,7 +1951,7 @@
> 	u_int i;
> 	int ret;
> 	struct addrinfo *ai;
>-	char addr[NI_MAXHOST], port[NI_MAXSERV], *s = NULL;
>+	char addr[NI_MAXHOST], port[NI_MAXSERV], *s = NULL, *cp;
> 
> 	/* these are usually at the top of the config */
> 	for (i = 0; i < o->num_ports; i++)
>@@ -2038,9 +2038,12 @@
> 	/* string arguments */
> 	dump_cfg_string(sPidFile, o->pid_file);
> 	dump_cfg_string(sXAuthLocation, o->xauth_location);
>-	dump_cfg_string(sCiphers, o->ciphers ? o->ciphers :
>-	    cipher_alg_list(',', 0));
>-	dump_cfg_string(sMacs, o->macs ? o->macs : mac_alg_list(','));
>+	cp = cipher_alg_list('n', 0);
>+	dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : cp);
>+	free(cp);
>+	cp = mac_alg_list(',');
>+	dump_cfg_string(sMacs, o->macs ? o->macs : cp);
>+	free(cp);
> 	dump_cfg_string(sBanner, o->banner);
> 	dump_cfg_string(sForceCommand, o->adm_forced_command);
> 	dump_cfg_string(sChrootDirectory, o->chroot_directory);
>@@ -2052,8 +2055,10 @@
> 	dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
> 	dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
> 	dump_cfg_string(sHostKeyAgent, o->host_key_agent);
>+	cp = kex_alg_list(',');
> 	dump_cfg_string(sKexAlgorithms, o->kex_algorithms ? o->kex_algorithms :
>-	    kex_alg_list(','));
>+	    cp);
>+	free(cp);
> 
> 	/* string arguments requiring a lookup */
> 	dump_cfg_string(sLogLevel, log_level_name(o->log_level));

Actions: View | Diff

Attachments on bug 2208: 2414