comparison src/protocols/yahoo/yahoo.c @ 10610:74cc119beceb

[gaim-migrate @ 12063] Better handling of nonYMSG packets in HEAD. I think needing this is madness. committer: Tailor Script <[e-mail]>

10609:6239870efd8e

		int pos = 0;
		int pktlen;

		if (yd->rxlen < YAHOO_PACKET_HDRLEN)
			return;

		pos += 4; /* YMSG */
		pos += 2;
		pos += 2;

10610:74cc119beceb

		int pos = 0;
		int pktlen;

		if (yd->rxlen < YAHOO_PACKET_HDRLEN)
			return;

		if (strncmp(yd->rxqueue, "YMSG", MIN(4, yd->rxlen)) != 0) {
			/* HEY! This isn't even a YMSG packet. What
			 * are you trying to pull? */
			guchar *start;

			gaim_debug_warning("yahoo", "Error in YMSG stream, got something not a YMSG packet!");
			
			start = memchr(yd->rxqueue, 'Y', yd->rxlen);
			if (start) {
				g_memmove(yd->rxqueue, start, yd->rxlen - (start - yd->rxqueue));
				yd->rxlen -= start - yd->rxqueue;
				continue;
			} else {
				/* hmm this could screw up with just the Y, YM, or YMS is at the very
				   end of the packet */
				g_free(yd->rxqueue);
				yd->rxqueue = NULL;
				yd->rxlen = 0;
				return;
			}
		}

		pos += 4; /* YMSG */
		pos += 2;
		pos += 2;