Attachment #2124 for bug #1967

View | Details | Raw Unified | Return to bug 1967
Collapse All | Expand All

Lines 292-297 process_mux_master_hello(u_int rid, Chan Link Here

(-)mux.c (+5 lines)
292	if (name == NULL \|\| value == NULL) {	292	if (name == NULL \|\| value == NULL) {
293	if (name != NULL)	293	if (name != NULL)
294	xfree(name);	294	xfree(name);
		295	if (value != NULL)
		296	xfree(value);
295	goto malf;	297	goto malf;
296	}	298	}
297	debug2("Unrecognised slave extension \"%s\"", name);	299	debug2("Unrecognised slave extension \"%s\"", name);
Lines 331-336 process_mux_new_session(u_int rid, Chann Link Here
331	xfree(reserved);	333	xfree(reserved);
332	if (cctx->term != NULL)	334	if (cctx->term != NULL)
333	xfree(cctx->term);	335	xfree(cctx->term);
		336	xfree(cctx);
334	error("%s: malformed message", __func__);	337	error("%s: malformed message", __func__);
335	return -1;	338	return -1;
336	}	339	}
Lines 1446-1451 mux_client_read_packet(int fd, Buffer *m Link Here
1446	if ((oerrno = errno) == EPIPE)	1449	if ((oerrno = errno) == EPIPE)
1447	debug3("%s: read header failed: %s", __func__, strerror(errno));	1450	debug3("%s: read header failed: %s", __func__, strerror(errno));
1448	errno = oerrno;	1451	errno = oerrno;
		1452	buffer_free(&queue);
1449	return -1;	1453	return -1;
1450	}	1454	}
1451	need = get_u32(buffer_ptr(&queue));	1455	need = get_u32(buffer_ptr(&queue));
Lines 1453-1458 mux_client_read_packet(int fd, Buffer *m Link Here
1453	oerrno = errno;	1457	oerrno = errno;
1454	debug3("%s: read body failed: %s", __func__, strerror(errno));	1458	debug3("%s: read body failed: %s", __func__, strerror(errno));
1455	errno = oerrno;	1459	errno = oerrno;
		1460	buffer_free(&queue);
1456	return -1;	1461	return -1;
1457	}	1462	}
1458	ptr = buffer_get_string_ptr(&queue, &have);	1463	ptr = buffer_get_string_ptr(&queue, &have);

Lines 1063-1068 parse_int: Link Here

(-)readconf.c (+2 lines)
1063	fatal("%.200s line %d: garbage at end of line; \"%.200s\".",	1063	fatal("%.200s line %d: garbage at end of line; \"%.200s\".",
1064	filename, linenum, arg);	1064	filename, linenum, arg);
1065	}	1065	}
		1066	if (arg != NULL)
		1067	xfree(arg);
1066	return 0;	1068	return 0;
1067	}	1069	}
1068		1070

Lines 1323-1330 load_identity_file(char *filename) Link Here

(-)sshconnect2.c (-3 / +6 lines)
1323	return NULL;	1323	return NULL;
1324	}	1324	}
1325	private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok);	1325	private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok);
1326	if (!perm_ok)	1326	if (!perm_ok) {
		1327	if (private != NULL)
		1328	key_free(private);
1327	return NULL;	1329	return NULL;
		1330	}
1328	if (private == NULL) {	1331	if (private == NULL) {
1329	if (options.batch_mode)	1332	if (options.batch_mode)
1330	return NULL;	1333	return NULL;
Lines 1892-1900 authmethod_get(char *authlist) Link Here
1892	xfree(name);	1895	xfree(name);
1893	return current;	1896	return current;
1894	}	1897	}
		1898	if (name != NULL)
		1899	xfree(name);
1895	}	1900	}
1896	if (name != NULL)
1897	xfree(name);
1898	}	1901	}
1899		1902
1900	static char *	1903	static char *

Return to bug 1967