comparison libpurple/proxy.c @ 30185:9e60e300541a

Fix an invalid memory deref with Windows proxy settings when there's no ":port" Patch from Marten Klencke. Closes #11701. committer: Paul Aurich <[e-mail]>

30184:3ac7f10d13d4

{
	int port = default_port;
	char *d;

	d = g_strrstr(host, ":");
	if (d)
		*d = '\0';
	d++;
	if (*d)
		sscanf(d, "%d", &port);

	purple_proxy_info_set_host(info, host);
	purple_proxy_info_set_port(info, port);
}

30185:9e60e300541a

{
	int port = default_port;
	char *d;

	d = g_strrstr(host, ":");
	if (d) {
		*d = '\0';

		d++;
		if (*d)
			sscanf(d, "%d", &port);

		if (port == 0)
			port = default_port;
	}

	purple_proxy_info_set_host(info, host);
	purple_proxy_info_set_port(info, port);
}