From 71be7666558da9924f1c44320c8ab42b2a319d06 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 24 Oct 2006 10:57:14 +0000 Subject: [PATCH] - add header size to memory size allocated for pools (fixes SEGV if sz < POOL_HDR_BYTES) - fix padding on alpha with gcc <= 3.3 Changed files: proftpd-pool.patch -> 1.1 --- proftpd-pool.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 proftpd-pool.patch diff --git a/proftpd-pool.patch b/proftpd-pool.patch new file mode 100644 index 0000000..eaf6d3b --- /dev/null +++ b/proftpd-pool.patch @@ -0,0 +1,20 @@ +--- proftpd-1.3.0/src/pool.c.orig 2005-03-08 18:06:39.000000000 +0100 ++++ proftpd-1.3.0/src/pool.c 2006-10-24 12:53:07.000000000 +0200 +@@ -47,7 +47,7 @@ + union align a; + + /* Padding */ +-#if defined(_LP64) || defined(__LP64__) ++#if defined(_LP64) || defined(__LP64__) || defined(__alpha__) + char pad[32]; + #endif + +@@ -363,7 +363,7 @@ + + pr_alarms_block(); + +- blok = new_block(sz, TRUE); ++ blok = new_block(sz + POOL_HDR_BYTES, TRUE); + + new_pool = (pool *) blok->h.first_avail; + blok->h.first_avail += POOL_HDR_BYTES; -- 2.44.0