mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
Update to 0.59.7.
This commit is contained in:
parent
9189f18b29
commit
c0c92e12bd
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=72072
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= gaim
|
||||
PORTVERSION= 0.59.6
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.59.7
|
||||
CATEGORIES?= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f
|
||||
MD5 (gaim-0.59.7.tar.bz2) = 65155b1da1fd5262671a9f21eeaf5e54
|
||||
|
@ -1,49 +0,0 @@
|
||||
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++;
|
||||
}
|
||||
}
|
||||
|
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= gaim
|
||||
PORTVERSION= 0.59.6
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.59.7
|
||||
CATEGORIES?= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f
|
||||
MD5 (gaim-0.59.7.tar.bz2) = 65155b1da1fd5262671a9f21eeaf5e54
|
||||
|
@ -1,49 +0,0 @@
|
||||
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++;
|
||||
}
|
||||
}
|
||||
|
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= gaim
|
||||
PORTVERSION= 0.59.6
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.59.7
|
||||
CATEGORIES?= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f
|
||||
MD5 (gaim-0.59.7.tar.bz2) = 65155b1da1fd5262671a9f21eeaf5e54
|
||||
|
@ -1,49 +0,0 @@
|
||||
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++;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user