comparison src/protocols/jabber/jabber.c @ 3236:6796fdeed022

[gaim-migrate @ 3253] Added code to detect invalid JIDs and prevent Gaim from crashing on them. Removed "safety check" call in jabber_handlebuddy() to apparently broken xmlnode_get_datasz() function. committer: Tailor Script <[e-mail]>

3235:59cad0db9a6b

		pool_free(p);	/* no need for this anymore! */
		return (NULL);
	}
	gjc->p = p;

	gjc->user = jid_new(p, user);
	gjc->pass = pstrdup(p, pass);

	gjc->state = JCONN_STATE_OFF;
	gjc->was_connected = 0;
	gjc->id = 1;

			return TRUE;
		m = m->next;
	}

	return FALSE;
}

/*
 * keep track of away msg same as yahoo plugin
 */

		return;
	}

	buddyname = g_strdup_printf("%s@%s", who->user, who->server);

	if((g = xmlnode_get_tag(x, "group")) != NULL && xmlnode_get_datasz(g) > 0) {
		groupname = xmlnode_get_data(g);
	}

	/*
	 * Add or remove a buddy?  Change buddy's alias or group?

				b->show[BUDDY_ALIAS_MAXLEN - 1] = '\0';	/* cheap safety feature */
				handle_buddy_rename(b, buddyname);
			}
		}
	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
		if ((b = find_buddy(GJ_GC(gjc), buddyname)) != NULL) {
			struct group *group;

			group = find_group_by_buddy(GJ_GC(gjc), buddyname);
			debug_printf("removing buddy [1]: %s, from group: %s\n",
				buddyname, group->name);
			remove_buddy(GJ_GC(gjc), group, b);
			do_export(GJ_GC(gjc));
		}
	}
	g_free(buddyname);

}

static gboolean jabber_free(gpointer data)
{
	struct jabber_data *jd = data;

	gjab_delete(jd->gjc);
	g_free(jd->gjc->sid);
	jd->gjc = NULL;
	g_free(jd);

	return FALSE;
}

			g_hash_table_destroy(jd->hash);
			jd->hash = NULL;
		}

		/* Free-up the pending queries memories and the list */
		if(jd->gjc->queries != NULL) {
			g_hash_table_foreach_remove(jd->gjc->queries, jabber_destroy_hash, NULL);
			g_hash_table_destroy(jd->gjc->queries);
			jd->gjc->queries = NULL;
		}
	}
	if (gc->inpa)
		gaim_input_remove(gc->inpa);

	if(jd) {
		g_timeout_add(50, jabber_free, jd);
		xmlnode_free(jd->gjc->current);
	}
	gc->proto_data = NULL;
}

static int jabber_send_im(struct gaim_connection *gc, char *who, char *message, int len, int flags)

		return;

	if (!strchr(name, '@'))
		realwho = g_strdup_printf("%s@%s", name, gjc->user->server);
	else {
		jid who = jid_new(gjc->p, name);
		if (who->user == NULL) {
			/* FIXME: transport */
			return;
		}
		realwho = g_strdup_printf("%s@%s", who->user, who->server);

	realwho = create_valid_jid(data->data, data->next->data,
			data->next->next->data);
	debug_printf("%s\n", realwho);

	Jid = jid_new(gjc->p, realwho);

	if((jc = find_any_chat(gc, Jid)) != NULL) {
		free(Jid);	/* don't need it, after all */
		switch(jc->state) {
			case JCS_PENDING:

3236:6796fdeed022

		pool_free(p);	/* no need for this anymore! */
		return (NULL);
	}
	gjc->p = p;

	if((gjc->user = jid_new(p, user)) == NULL) {
		pool_free(p);	/* no need for this anymore! */
		return (NULL);
	}
	gjc->pass = pstrdup(p, pass);

	gjc->state = JCONN_STATE_OFF;
	gjc->was_connected = 0;
	gjc->id = 1;

			return TRUE;
		m = m->next;
	}

	return FALSE;
}

/*
 * Remove a buddy from the (gaim) buddylist (if he's on it)
 */
static void jabber_remove_gaim_buddy(struct gaim_connection *gc, char *buddyname)
{
	struct buddy *b;

	if ((b = find_buddy(gc, buddyname)) != NULL) {
		struct group *group;

		group = find_group_by_buddy(gc, buddyname);
		debug_printf("removing buddy [1]: %s, from group: %s\n", buddyname, group->name);
		remove_buddy(gc, group, b);
		do_export(gc);
	}
}

/*
 * keep track of away msg same as yahoo plugin
 */

		return;
	}

	buddyname = g_strdup_printf("%s@%s", who->user, who->server);

	if((g = xmlnode_get_tag(x, "group")) != NULL) {
		groupname = xmlnode_get_data(g);
	}

	/*
	 * Add or remove a buddy?  Change buddy's alias or group?

				b->show[BUDDY_ALIAS_MAXLEN - 1] = '\0';	/* cheap safety feature */
				handle_buddy_rename(b, buddyname);
			}
		}
	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
		jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);
	}
	g_free(buddyname);

}

static gboolean jabber_free(gpointer data)
{
	struct jabber_data *jd = data;

	if(jd->gjc != NULL) {
		gjab_delete(jd->gjc);
		g_free(jd->gjc->sid);
		jd->gjc = NULL;
	}
	g_free(jd);

	return FALSE;
}

			g_hash_table_destroy(jd->hash);
			jd->hash = NULL;
		}

		/* Free-up the pending queries memories and the list */
		if(jd->gjc != NULL && jd->gjc->queries != NULL) {
			g_hash_table_foreach_remove(jd->gjc->queries, jabber_destroy_hash, NULL);
			g_hash_table_destroy(jd->gjc->queries);
			jd->gjc->queries = NULL;
		}
	}
	if (gc->inpa)
		gaim_input_remove(gc->inpa);

	if(jd) {
		g_timeout_add(50, jabber_free, jd);
		if(jd->gjc != NULL)
			xmlnode_free(jd->gjc->current);
	}
	gc->proto_data = NULL;
}

static int jabber_send_im(struct gaim_connection *gc, char *who, char *message, int len, int flags)

		return;

	if (!strchr(name, '@'))
		realwho = g_strdup_printf("%s@%s", name, gjc->user->server);
	else {
		jid who;
		
		if((who = jid_new(gjc->p, name)) == NULL) {
			char *msg = g_strdup_printf("%s: \"%s\"", _("Invalid Jabber I.D."), name);
			do_error_dialog(msg, _("Jabber Error"));
			g_free(msg);
			jabber_remove_gaim_buddy(gc, name);
			return;
		}
		if (who->user == NULL) {
			/* FIXME: transport */
			return;
		}
		realwho = g_strdup_printf("%s@%s", who->user, who->server);

	realwho = create_valid_jid(data->data, data->next->data,
			data->next->next->data);
	debug_printf("%s\n", realwho);

	if((Jid = jid_new(gjc->p, realwho)) == NULL) {
		char *msg = g_strdup_printf("%s: \"%s\"", _("Invalid Jabber I.D."), realwho);
		do_error_dialog(msg, _("Jabber Error"));
		g_free(msg);
		return;
	}

	if((jc = find_any_chat(gc, Jid)) != NULL) {
		free(Jid);	/* don't need it, after all */
		switch(jc->state) {
			case JCS_PENDING: