summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-12-18 22:34:52 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-12-18 22:34:52 +0000
commit33b28e4a9b4aaf1f00980710737af6241e9aa869 (patch)
treea03ecaab004fd744e5a47d3233d134aa856eaf0a /net
parentRegister the config file too, no only the sample config. (diff)
Fix a crash that can occur with an improperly formatted history file.
PR: 74522 Submitted by: kostik <kostik@ncport.ru>
Notes
Notes: svn path=/head/; revision=124425
Diffstat (limited to 'net')
-rw-r--r--net/gnomeicu/gnomeicu/Makefile2
-rw-r--r--net/gnomeicu/gnomeicu/files/patch-src_history.c14
-rw-r--r--net/gnomeicu2/Makefile2
-rw-r--r--net/gnomeicu2/files/patch-src_history.c14
4 files changed, 30 insertions, 2 deletions
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index 56785171bc9b..19d47230ffc3 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomeicu2
PORTVERSION= 0.99.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomeicu
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_history.c b/net/gnomeicu/gnomeicu/files/patch-src_history.c
new file mode 100644
index 000000000000..b529bd13bda2
--- /dev/null
+++ b/net/gnomeicu/gnomeicu/files/patch-src_history.c
@@ -0,0 +1,14 @@
+--- src/history.c.orig Mon Nov 29 20:48:25 2004
++++ src/history.c Mon Nov 29 20:21:37 2004
+@@ -214,6 +214,11 @@
+ char direction;
+ time_t time;
+
++ if (! (ptr+4)) {
++ g_free (hp->buffer);
++ g_free (hp);
++ return FALSE;
++ }
+ /* read header info */
+ sscanf (ptr+4, "%c %d", &direction, (int *)&time);
+
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index 56785171bc9b..19d47230ffc3 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomeicu2
PORTVERSION= 0.99.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomeicu
diff --git a/net/gnomeicu2/files/patch-src_history.c b/net/gnomeicu2/files/patch-src_history.c
new file mode 100644
index 000000000000..b529bd13bda2
--- /dev/null
+++ b/net/gnomeicu2/files/patch-src_history.c
@@ -0,0 +1,14 @@
+--- src/history.c.orig Mon Nov 29 20:48:25 2004
++++ src/history.c Mon Nov 29 20:21:37 2004
+@@ -214,6 +214,11 @@
+ char direction;
+ time_t time;
+
++ if (! (ptr+4)) {
++ g_free (hp->buffer);
++ g_free (hp);
++ return FALSE;
++ }
+ /* read header info */
+ sscanf (ptr+4, "%c %d", &direction, (int *)&time);
+