ops, previous diff was wrong. correct one now. bump package again. sorry.

This commit is contained in:
fgsch 2005-08-11 16:58:52 +00:00
parent b055c8dfd2
commit 4cd248672e
2 changed files with 13 additions and 13 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.80 2005/08/11 15:54:24 fgsch Exp $
# $OpenBSD: Makefile,v 1.81 2005/08/11 16:58:52 fgsch Exp $
SHARED_ONLY= Yes
COMMENT= "Gtk AIM, ICQ, IRC, Jabber, MSN, Yahoo, SILC and Zephyr client"
DISTNAME= gaim-1.4.0
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= net
HOMEPAGE= http://gaim.sourceforge.net/

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_protocols_msn_msg_c,v 1.1 2005/08/11 15:54:24 fgsch Exp $
--- src/protocols/msn/msg.c.orig Wed Aug 10 20:26:48 2005
+++ src/protocols/msn/msg.c Wed Aug 10 20:28:08 2005
$OpenBSD: patch-src_protocols_msn_msg_c,v 1.2 2005/08/11 16:58:52 fgsch Exp $
--- src/protocols/msn/msg.c.orig Thu Jun 9 23:29:45 2005
+++ src/protocols/msn/msg.c Thu Aug 11 13:31:35 2005
@@ -187,7 +187,8 @@ msn_message_parse_slp_body(MsnMessage *m
if (body_len > 0) {
msg->body_len = len - (tmp - body);
- msg->body = g_memdup(tmp, msg->body_len);
+ msg->body = g_memdup(tmp, msg->body_len + 1);
+ msg->body[msg->body_len] = '\0';
+ msg->body = g_malloc0(msg->body_len + 1);
+ memcpy(msg->body, tmp, msg->body_len);
tmp += body_len;
}
}
@ -16,8 +16,8 @@ $OpenBSD: patch-src_protocols_msn_msg_c,v 1.1 2005/08/11 15:54:24 fgsch Exp $
if (body_len > 0) {
msg->body_len = body_len;
- msg->body = g_memdup(tmp, msg->body_len);
+ msg->body = g_memdup(tmp, msg->body_len + 1);
+ msg->body[msg->body_len] = '\0';
+ msg->body = g_malloc0(msg->body_len + 1);
+ memcpy(msg->body, tmp, msg->body_len);
tmp += body_len;
}
@ -26,8 +26,8 @@ $OpenBSD: patch-src_protocols_msn_msg_c,v 1.1 2005/08/11 15:54:24 fgsch Exp $
if (payload_len - (tmp - tmp_base) > 0) {
msg->body_len = payload_len - (tmp - tmp_base);
- msg->body = g_memdup(tmp, msg->body_len);
+ msg->body = g_memdup(tmp, msg->body_len + 1);
+ msg->body[msg->body_len] = '\0';
+ msg->body = g_malloc0(msg->body_len + 1);
+ memcpy(msg->body, tmp, msg->body_len);
}
}
@ -36,8 +36,8 @@ $OpenBSD: patch-src_protocols_msn_msg_c,v 1.1 2005/08/11 15:54:24 fgsch Exp $
if (data != NULL && len > 0)
{
- msg->body = g_memdup(data, len);
+ msg->body = g_memdup(data, len + 1);
+ msg->body[len] = '\0';
+ msg->body = g_malloc0(len + 1);
+ memcpy(msg->body, data, len);
msg->body_len = len;
}
else