comparison libpurple/dnssrv.c @ 16914:11a0f2b4ac83

If the read() in resolved() fails, we should detect the failure and set size (which it would otherwise set, since it is passed by reference) to 0 and res to NULL. This ''may'' fix a rather odd crash described in Adium Trac #6623 (http://trac.adiumx.com/ticket/6623), and it is certainly good sanity checking.

16912:f9e7a7dacda3

	PurpleSrvResponse *tmp;
	int i;
	PurpleSrvCallback cb = query_data->cb;
	int status;

	read(source, &size, sizeof(int));
	purple_debug_info("dnssrv","found %d SRV entries\n", size);
	tmp = res = g_new0(PurpleSrvResponse, size);
	for (i = 0; i < size; i++) {
		read(source, tmp++, sizeof(PurpleSrvResponse));
	}

	cb(res, size, query_data->extradata);
	waitpid(query_data->pid, &status, 0);

16914:11a0f2b4ac83

	PurpleSrvResponse *tmp;
	int i;
	PurpleSrvCallback cb = query_data->cb;
	int status;

	if (read(source, &size, sizeof(int)) > 0)
	{
		purple_debug_info("dnssrv","found %d SRV entries\n", size);
		tmp = res = g_new0(PurpleSrvResponse, size);
		for (i = 0; i < size; i++) {
			read(source, tmp++, sizeof(PurpleSrvResponse));
		}
	}
	else
	{
		purple_debug_info("dnssrv","found 0 SRV entries; errno is %i\n", errno);
		size = 0;
		res = NULL;
	}

	cb(res, size, query_data->extradata);
	waitpid(query_data->pid, &status, 0);