Attachment #22553 for bug #56630

View | Details | Raw Unified | Return to bug 56630
Collapse All | Expand All

Lines 146-161 Link Here

(-)servconn.c.orig (-3 / +12 lines)
146		146
147	if (servconn->multiline_type == MSN_MULTILINE_MSG) {	147	if (servconn->multiline_type == MSN_MULTILINE_MSG) {
148	MsnMessage *msg;	148	MsnMessage *msg;
149	size_t header_len;	149	size_t header_len, left;
150		150
151	g_snprintf(msg_str, sizeof(msg_str),	151	g_snprintf(msg_str, sizeof(msg_str),
152	"MSG %s %s %d\r\n",	152	"MSG %s %s %05d\r\n",
153	servconn->msg_passport, servconn->msg_friendly,	153	servconn->msg_passport, servconn->msg_friendly,
154	servconn->multiline_len);	154	servconn->multiline_len);
155		155
156	header_len = strlen(msg_str);	156	header_len = strlen(msg_str);
		157	left = sizeof(msg_str) - header_len;
		158	if (left > servconn->multiline_len)
		159	left = servconn->multiline_len;
157		160
158	memcpy(msg_str + header_len, buffer, servconn->multiline_len);	161	g_snprintf(msg_str, sizeof(msg_str),
		162	"MSG %s %s %05d\r\n",
		163	servconn->msg_passport, servconn->msg_friendly,
		164	left);
		165
		166	memcpy(msg_str + header_len, buffer, left);
159		167
160	gaim_debug(GAIM_DEBUG_MISC, "msn",	168	gaim_debug(GAIM_DEBUG_MISC, "msn",
161	"Message: {%s}\n", buffer);	169	"Message: {%s}\n", buffer);
Lines 654-656 Link Here
654	}	662	}
655	}	663	}
656	}	664	}
		665

Lines 224-236 Link Here

(-)msnslp.c.orig (-2 / +6 lines)
224	/* It's not valid. Kill this off. */	224	/* It's not valid. Kill this off. */
225	char temp[32];	225	char temp[32];
226	const char *c;	226	const char *c;
		227	size_t offset;
227		228
		229	memset(temp, 0, sizeof(temp));
228	/* Eww */	230	/* Eww */
229	if ((c = strchr(status, '\r')) \|\| (c = strchr(status, '\n')) \|\|	231	if ((c = strchr(status, '\r')) \|\| (c = strchr(status, '\n')) \|\|
230	(c = strchr(status, '\0')))	232	(c = strchr(status, '\0')))
231	{	233	{
232	strncpy(temp, status, c - status);	234	offset = c - status;
233	temp[c - status] = '\0';	235	if (offset >= sizeof(temp))
		236	offset = sizeof(temp) - 1;
		237	strncpy(temp, status, offset);
234	}	238	}
235		239
236	gaim_debug_error("msn", "Received non-OK result: %s\n", temp);	240	gaim_debug_error("msn", "Received non-OK result: %s\n", temp);

Lines 257-263 Link Here

(-)msg.c.orig (-1 / +2 lines)
257		257
258	msg->msnslp_message = TRUE;	258	msg->msnslp_message = TRUE;
259		259
260	memcpy(header, tmp, 48);	260	memset(header, 0, sizeof(header));
		261	memcpy(header, tmp, sizeof(header)-1);
261		262
262	tmp += 48;	263	tmp += 48;
263		264
Lines 901-904 Link Here
901		902
902	return table;	903	return table;
903	}	904	}

Return to bug 56630