]> git.pld-linux.org Git - packages/proftpd.git/commitdiff
- add header size to memory size allocated for pools (fixes SEGV if sz < POOL_HDR_BYTES)
authorJakub Bogusz <qboosh@pld-linux.org>
Tue, 24 Oct 2006 10:57:14 +0000 (10:57 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
- fix padding on alpha with gcc <= 3.3

Changed files:
    proftpd-pool.patch -> 1.1

proftpd-pool.patch [new file with mode: 0644]

diff --git a/proftpd-pool.patch b/proftpd-pool.patch
new file mode 100644 (file)
index 0000000..eaf6d3b
--- /dev/null
@@ -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;
This page took 0.081827 seconds and 4 git commands to generate.