diff options
| author | mrg <mrg@pkgsrc.org> | 2018-09-26 10:38:26 +0000 |
|---|---|---|
| committer | mrg <mrg@pkgsrc.org> | 2018-09-26 10:38:26 +0000 |
| commit | 53b3279cec80f9b2e66ab573b0d2d69645f382bc (patch) | |
| tree | 7a73825d4b7c2bb18dcaca82086915ff5b7fcc28 /chat | |
| parent | b5447fef68345a25ed81bbbac4d639e973084396 (diff) | |
| download | pkgsrc-53b3279cec80f9b2e66ab573b0d2d69645f382bc.tar.gz | |
fix problem from upstream: avoid failing to nul terminate strings, which
could lead to garbage being added to assignment values.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/ircII/Makefile | 4 | ||||
| -rw-r--r-- | chat/ircII/distinfo | 3 | ||||
| -rw-r--r-- | chat/ircII/patches/patch-ircaux.c | 34 |
3 files changed, 38 insertions, 3 deletions
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index 2b38fb5b8a9..7e9c5db0f90 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.79 2018/07/19 22:22:21 mrg Exp $ +# $NetBSD: Makefile,v 1.80 2018/09/26 10:38:26 mrg Exp $ DISTNAME= ircii-${VERS} PKGNAME= ircII-${VERS} CATEGORIES= chat MASTER_SITES= http://ircii.warped.com/ EXTRACT_SUFX= .tar.bz2 -PKGREVISION= 1 +PKGREVISION= 2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.eterna.com.au/ircii/ diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo index 26f9eaf663f..8a5ddfd1a46 100644 --- a/chat/ircII/distinfo +++ b/chat/ircII/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2018/07/19 22:22:21 mrg Exp $ +$NetBSD: distinfo,v 1.48 2018/09/26 10:38:26 mrg Exp $ SHA1 (ircii-20170704.tar.bz2) = 88f55a59af48d7ed131895d68354fe7f566e3180 RMD160 (ircii-20170704.tar.bz2) = b857a49c6d843748b0bcbccf9e3aec16d7be974b @@ -6,4 +6,5 @@ SHA512 (ircii-20170704.tar.bz2) = a0cdc5603fab040fa2f7d2b3d7a564e9eeac4b402329cb Size (ircii-20170704.tar.bz2) = 596535 bytes SHA1 (patch-ac) = 9f6f3b27670b63ff00b55c5431ec1da5219369ff SHA1 (patch-include_irc.h) = 257e7879461d88d9e8e05205e96cdec702e9e458 +SHA1 (patch-ircaux.c) = ab4d614cc20b3591a276b27ac818ed409c2116f6 SHA1 (patch-source_names.c) = 53b22dcf43f274bb4a67c6ee016260e76c090756 diff --git a/chat/ircII/patches/patch-ircaux.c b/chat/ircII/patches/patch-ircaux.c new file mode 100644 index 00000000000..5eca6162069 --- /dev/null +++ b/chat/ircII/patches/patch-ircaux.c @@ -0,0 +1,34 @@ +$NetBSD: patch-ircaux.c,v 1.1 2018/09/26 10:38:26 mrg Exp $ + +avoid trailing garbage in some variable assignments. + +Index: source/ircaux.c +=================================================================== +RCS file: /home/cvs/ircii/source/ircaux.c,v +retrieving revision 1.123 +retrieving revision 1.124 +diff -p -u -r1.123 -r1.124 +--- source/ircaux.c 4 Jul 2017 12:10:22 -0000 1.123 ++++ source/ircaux.c 13 Sep 2017 21:24:56 -0000 1.124 +@@ -946,7 +946,7 @@ double_quote_work(u_char *str, u_char *s + } + if (dst && pos < dstlen) + dst[pos] = '\0'; +- return pos; ++ return pos + 1; + } + + /* +@@ -961,10 +961,10 @@ double_quote(u_char *str, u_char *stuff) + size_t len, len2; + + len = double_quote_work(str, stuff, NULL, 0); +- if (len == 0) ++ if (len == 1) + return empty_string(); + +- dst = new_malloc(len + 1); ++ dst = new_malloc(len); + len2 = double_quote_work(str, stuff, dst, len); + if (len != len2) + yell("--- double_quote() error: len %zu len2 %zu", len, len2); |