[proftpd-dfsg] 01/01: Patch for GutHub Issue 305.

[Hilmar Preuße]

This is an automated email from the git hooks/post-receive script.

hilmar-guest pushed a commit to branch master
in repository proftpd-dfsg.

commit 005ec5ff4dead0686a3b283abb682834f6c6c065
Author: Hilmar Preuße <hille42 at web.de>
Date:   Tue Dec 20 11:15:50 2016 +0100

    Patch for GutHub Issue 305.
---
 debian/changelog                                  |  4 ++++
 debian/patches/github_305_handling_unclosed_files | 24 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 28f4f85..fbae082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ proftpd-dfsg (1.3.5b-2) unstable; urgency=medium
     removed lintian override).
   * Tighten B-D version of debhelper (dh_update_autotools_config was
     introduced).
+  * Patch github_305_handling_unclosed_files
+    When handling unclosed files for an aborted SFTP session, we will need a
+    valid response pool.  So provide one.  The lack of this may have been causing
+    some segfaults. (LP: #1647094)
 
   [ Francesco Paolo Lovergine ]
   * Makes piuparts happy by removing /srv/ftp on purge 
diff --git a/debian/patches/github_305_handling_unclosed_files b/debian/patches/github_305_handling_unclosed_files
new file mode 100644
index 0000000..3ea84f2
--- /dev/null
+++ b/debian/patches/github_305_handling_unclosed_files
@@ -0,0 +1,24 @@
+Index: proftpd-dfsg/contrib/mod_sftp/fxp.c
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_sftp/fxp.c	2016-12-20 11:01:35.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/fxp.c	2016-12-20 11:07:32.000000000 +0100
+@@ -1,6 +1,6 @@
+ /*
+  * ProFTPD - mod_sftp sftp
+- * Copyright (c) 2008-2015 TJ Saunders
++ * Copyright (c) 2008-2016 TJ Saunders
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -11909,6 +11909,11 @@
+             "aborting %d unclosed file %s", count,
+             count != 1 ? "handles" : "handle");
+ 
++          /* Make sure that any abort processing has a valid response pool to
++           * work with.
++           */
++          pr_response_set_pool(sess->pool);
++
+           res = pr_table_do(sess->handle_tab, fxp_handle_abort, callback_data,
+             PR_TABLE_DO_FL_ALL);
+           if (res < 0) {
diff --git a/debian/patches/series b/debian/patches/series
index b1b7fae..3f57e45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ contrib_hardening_flags
 FTBS_on_Hurd
 reproducible_build
 not_read_whole_passwd_db
+github_305_handling_unclosed_files

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git