summaryrefslogtreecommitdiff
path: root/japanese/mutt
diff options
context:
space:
mode:
authorShaun Amott <shaun@FreeBSD.org>2006-07-03 15:42:26 +0000
committerShaun Amott <shaun@FreeBSD.org>2006-07-03 15:42:26 +0000
commitc7d49534e6bac5ba902c8a426b2210847f54ed96 (patch)
tree0097bd299bff4b5a2b6da102b4d21a9d7eacc90a /japanese/mutt
parent- check to see if OPTIONS are up-to-date before build (diff)
- Add fix for recent IMAP buffer overflow vulnerability.
PR: ports/99700 Submitted by: shaun (me) Approved by: SHIOZAKI Takehiko <st@be.to> (maintainer), ahze (mentor) Security: VuXML d2a43243-087b-11db-bc36-0008743bf21a
Notes
Notes: svn path=/head/; revision=166846
Diffstat (limited to 'japanese/mutt')
-rw-r--r--japanese/mutt/Makefile2
-rw-r--r--japanese/mutt/files/patch-imap_browse.c27
2 files changed, 28 insertions, 1 deletions
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index b891120e47c1..cc8c5d690d45 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -9,7 +9,7 @@
PORTNAME= mutt
PORTVERSION= ${VERSION}.j${JP_VERSION}
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= japanese mail
MASTER_SITES= http://www.emaillab.org/mutt/1.4/ \
http://my.reset.jp/~iwashita/mutt/distfiles/ \
diff --git a/japanese/mutt/files/patch-imap_browse.c b/japanese/mutt/files/patch-imap_browse.c
new file mode 100644
index 000000000000..adbb0d3a9303
--- /dev/null
+++ b/japanese/mutt/files/patch-imap_browse.c
@@ -0,0 +1,27 @@
+--- imap/browse.c.orig Tue Feb 26 10:38:56 2002
++++ imap/browse.c Sat Jul 1 20:18:02 2006
+@@ -452,7 +452,7 @@
+ if (*s == '\"')
+ {
+ s++;
+- while (*s && *s != '\"')
++ while (*s && *s != '\"' && n < sizeof (ns) - 1)
+ {
+ if (*s == '\\')
+ s++;
+@@ -463,12 +463,14 @@
+ s++;
+ }
+ else
+- while (*s && !ISSPACE (*s))
++ while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
+ {
+ ns[n++] = *s;
+ s++;
+ }
+ ns[n] = '\0';
++ if (n == sizeof (ns) - 1)
++ dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
+ /* delim? */
+ s = imap_next_word (s);
+ /* delimiter is meaningless if namespace is "". Why does