diff options
| author | tron <tron@pkgsrc.org> | 2002-03-12 17:35:31 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2002-03-12 17:35:31 +0000 |
| commit | e117625f816bb68743b40d365ca2709bbe457e62 (patch) | |
| tree | a1cacf5e9eff6440acf3a529129a610d78741f7e /net/rsync | |
| parent | 4af9c657e8822051c297a6be9f1602d590f5fa3b (diff) | |
| download | pkgsrc-e117625f816bb68743b40d365ca2709bbe457e62.tar.gz | |
Fix a double free error (probably a missmerge) in the include "zlib".
Diffstat (limited to 'net/rsync')
| -rw-r--r-- | net/rsync/distinfo | 3 | ||||
| -rw-r--r-- | net/rsync/patches/patch-ab | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/net/rsync/distinfo b/net/rsync/distinfo index 6bb811cc879..afc05bab9e9 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/03/12 16:02:56 tron Exp $ +$NetBSD: distinfo,v 1.7 2002/03/12 17:35:31 tron Exp $ SHA1 (rsync-2.5.3.tar.gz) = e23791d0e53d63d8452bfbb9451b137745643838 Size (rsync-2.5.3.tar.gz) = 383692 bytes SHA1 (patch-aa) = 27c2925b67d38132507a2e8e41ba7e406a9d9051 +SHA1 (patch-ab) = 7c74750f761de607ee50f5c4a6e06bfb07851ae8 diff --git a/net/rsync/patches/patch-ab b/net/rsync/patches/patch-ab new file mode 100644 index 00000000000..5c3590aec47 --- /dev/null +++ b/net/rsync/patches/patch-ab @@ -0,0 +1,28 @@ +$NetBSD: patch-ab,v 1.6 2002/03/12 17:35:31 tron Exp $ + +--- zlib/infblock.c.orig Mon Mar 11 06:55:33 2002 ++++ zlib/infblock.c Tue Mar 12 18:31:47 2002 +@@ -315,7 +315,6 @@ + t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), + s->sub.trees.blens, &bl, &bd, &tl, &td, + s->hufts, z); +- ZFREE(z, s->sub.trees.blens); + if (t != Z_OK) + { + if (t == (uInt)Z_DATA_ERROR) +@@ -326,7 +325,6 @@ + r = t; + LEAVE + } +- ZFREE(z, s->sub.trees.blens); + Tracev((stderr, "inflate: trees ok\n")); + if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL) + { +@@ -335,6 +333,7 @@ + } + s->sub.decode.codes = c; + } ++ ZFREE(z, s->sub.trees.blens); + s->mode = CODES; + case CODES: + UPDATE |