comparison libpurple/util.c @ 24274:9ee331d042c8

Trigger url_fetch_connect_cb() asynchronously when the connection fails immediately instead of synchronously calling the callback and then returning NULL, causing a double free. Fixes #7278

24273:1263f302d05e

					     user_agent, http11,
					     request, include_headers, -1,
					     callback, user_data);
}

PurpleUtilFetchUrlData *
purple_util_fetch_url_request_len(const char *url, gboolean full,
		const char *user_agent, gboolean http11,
		const char *request, gboolean include_headers, gssize max_len,
		PurpleUtilFetchUrlCallback callback, void *user_data)

			gfud->website.address, gfud->website.port,
			url_fetch_connect_cb, gfud);

	if (gfud->connect_data == NULL)
	{
		purple_util_fetch_url_error(gfud, _("Unable to connect to %s"),
				gfud->website.address);
		return NULL;
	}

	return gfud;
}

24274:9ee331d042c8

					     user_agent, http11,
					     request, include_headers, -1,
					     callback, user_data);
}

static gboolean
url_fetch_connect_failed(gpointer data)
{
	url_fetch_connect_cb(data, -1, "");
	return FALSE;
}

PurpleUtilFetchUrlData *
purple_util_fetch_url_request_len(const char *url, gboolean full,
		const char *user_agent, gboolean http11,
		const char *request, gboolean include_headers, gssize max_len,
		PurpleUtilFetchUrlCallback callback, void *user_data)

			gfud->website.address, gfud->website.port,
			url_fetch_connect_cb, gfud);

	if (gfud->connect_data == NULL)
	{
		/* Trigger the connect_cb asynchronously. */
		purple_timeout_add(10, url_fetch_connect_failed, gfud);
	}

	return gfud;
}