comparison src/protocols/yahoo/yahoo.c @ 13461:b6a63c9b0cb4

[gaim-migrate @ 15836] Fix CID 30 and 31 (NULL deref.) committer: Tailor Script <[e-mail]>

13460:ca43d58cdc43

{
	GSList *l = pkt->hash;
	GSList *list = NULL;
	struct _yahoo_im *im = NULL;

	char imv[16];

	if (pkt->status <= 1 || pkt->status == 5) {
		while (l != NULL) {
			struct yahoo_pair *pair = l->data;
			if (pair->key == 4) {

					im->msg = pair->value;
			}
			/* IMV key */
			if (pair->key == 63)
			{
				strcpy(imv, pair->value);
			}
			l = l->next;
		}
	} else if (pkt->status == 2) {
		gaim_notify_error(gc, NULL,
		                  _("Your Yahoo! message did not get sent."), NULL);
	}

	/* Check for the Doodle IMV */
	if(!strcmp(imv, "doodle;11"))
	{
		GaimWhiteboard *wb;

		if (!yahoo_privacy_check(gc, im->from)) {
			gaim_debug_info("yahoo", "Doodle request from %s dropped.\n", im->from);

13461:b6a63c9b0cb4

{
	GSList *l = pkt->hash;
	GSList *list = NULL;
	struct _yahoo_im *im = NULL;

	const char *imv = NULL;

	if (pkt->status <= 1 || pkt->status == 5) {
		while (l != NULL) {
			struct yahoo_pair *pair = l->data;
			if (pair->key == 4) {

					im->msg = pair->value;
			}
			/* IMV key */
			if (pair->key == 63)
			{
				imv = pair->value;
			}
			l = l->next;
		}
	} else if (pkt->status == 2) {
		gaim_notify_error(gc, NULL,
		                  _("Your Yahoo! message did not get sent."), NULL);
	}

	/** TODO: It seems that this check should be per IM, not global */
	/* Check for the Doodle IMV */
	if(im != NULL && imv != NULL && !strcmp(imv, "doodle;11"))
	{
		GaimWhiteboard *wb;

		if (!yahoo_privacy_check(gc, im->from)) {
			gaim_debug_info("yahoo", "Doodle request from %s dropped.\n", im->from);