kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a segfault in the Yahoo protocol that can occur when a user receives

Browse source 
new email.

Reported by:	Kenneth W Cochran <kwc@TheWorld.com>
Obtained from:	gaim CVS
This commit is contained in:
Joe Marcus Clarke 2002-11-23 23:56:10 +00:00
parent a98b4af282
commit b960828c6d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=70920
6 changed files with 150 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net-im/gaim/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= gaim PORTNAME= gaim
PORTVERSION= 0.59.6 PORTVERSION= 0.59.6
PORTREVISION= 1
CATEGORIES?= net CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

49
net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c Normal file
View file

@ -0,0 +1,49 @@
This patch fixes a segfault that can occur when a Yahoo user receives new
mail. This patch is from gaim CVS, and will be integrated in the next
release.
--- src/protocols/yahoo/yahoo.c 2002/11/12 00:50:21 1.43.2.7
+++ src/protocols/yahoo/yahoo.c 2002/11/23 18:50:47 1.43.2.8
@@ -259,19 +259,20 @@
pair->key = strtol(key, NULL, 10);
accept = x; /* if x is 0 there was no key, so don't accept it */
- if (accept)
+ if (len - pos + 1 <= 0) {
+ /* Truncated. Garbage or something. */
+ accept = 0;
+ }
+
+ if (accept) {
value = g_malloc(len - pos + 1);
- x = 0;
- while (pos + 1 < len) {
- if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
- break;
- if (accept)
+ x = 0;
+ while (pos + 1 < len) {
+ if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
+ break;
value[x++] = data[pos++];
- }
- if (accept)
+ }
value[x] = 0;
- pos += 2;
- if (accept) {
pair->value = g_strdup(value);
g_free(value);
pkt->hash = g_slist_append(pkt->hash, pair);
@@ -279,6 +280,11 @@
} else {
g_free(pair);
}
+ pos += 2;
+
+ /* Skip over garbage we've noticed in the mail notifications */
+ if (data[0] == '9' && data[pos] == 0x01)
+ pos++;
}
}

1
net/gaim-snapshot/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= gaim PORTNAME= gaim
PORTVERSION= 0.59.6 PORTVERSION= 0.59.6
PORTREVISION= 1
CATEGORIES?= net CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

49
net/gaim-snapshot/files/patch-src_protocols_yahoo_yahoo.c Normal file
View file

@ -0,0 +1,49 @@
This patch fixes a segfault that can occur when a Yahoo user receives new
mail. This patch is from gaim CVS, and will be integrated in the next
release.
--- src/protocols/yahoo/yahoo.c 2002/11/12 00:50:21 1.43.2.7
+++ src/protocols/yahoo/yahoo.c 2002/11/23 18:50:47 1.43.2.8
@@ -259,19 +259,20 @@
pair->key = strtol(key, NULL, 10);
accept = x; /* if x is 0 there was no key, so don't accept it */
- if (accept)
+ if (len - pos + 1 <= 0) {
+ /* Truncated. Garbage or something. */
+ accept = 0;
+ }
+
+ if (accept) {
value = g_malloc(len - pos + 1);
- x = 0;
- while (pos + 1 < len) {
- if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
- break;
- if (accept)
+ x = 0;
+ while (pos + 1 < len) {
+ if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
+ break;
value[x++] = data[pos++];
- }
- if (accept)
+ }
value[x] = 0;
- pos += 2;
- if (accept) {
pair->value = g_strdup(value);
g_free(value);
pkt->hash = g_slist_append(pkt->hash, pair);
@@ -279,6 +280,11 @@
} else {
g_free(pair);
}
+ pos += 2;
+
+ /* Skip over garbage we've noticed in the mail notifications */
+ if (data[0] == '9' && data[pos] == 0x01)
+ pos++;
}
}

1
net/gaim/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= gaim PORTNAME= gaim
PORTVERSION= 0.59.6 PORTVERSION= 0.59.6
PORTREVISION= 1
CATEGORIES?= net CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

49
net/gaim/files/patch-src_protocols_yahoo_yahoo.c Normal file
View file

@ -0,0 +1,49 @@
This patch fixes a segfault that can occur when a Yahoo user receives new
mail. This patch is from gaim CVS, and will be integrated in the next
release.
--- src/protocols/yahoo/yahoo.c 2002/11/12 00:50:21 1.43.2.7
+++ src/protocols/yahoo/yahoo.c 2002/11/23 18:50:47 1.43.2.8
@@ -259,19 +259,20 @@
pair->key = strtol(key, NULL, 10);
accept = x; /* if x is 0 there was no key, so don't accept it */
- if (accept)
+ if (len - pos + 1 <= 0) {
+ /* Truncated. Garbage or something. */
+ accept = 0;
+ }
+
+ if (accept) {
value = g_malloc(len - pos + 1);
- x = 0;
- while (pos + 1 < len) {
- if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
- break;
- if (accept)
+ x = 0;
+ while (pos + 1 < len) {
+ if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
+ break;
value[x++] = data[pos++];
- }
- if (accept)
+ }
value[x] = 0;
- pos += 2;
- if (accept) {
pair->value = g_strdup(value);
g_free(value);
pkt->hash = g_slist_append(pkt->hash, pair);
@@ -279,6 +280,11 @@
} else {
g_free(pair);
}
+ pos += 2;
+
+ /* Skip over garbage we've noticed in the mail notifications */
+ if (data[0] == '9' && data[pos] == 0x01)
+ pos++;
}
}