[SCM] proftpd-dfsg branch, debian/1.3.3, updated. debian/1.3.3a-6-33-g408b2a9

[Francesco Paolo Lovergine]

The following commit has been merged in the debian/1.3.3 branch:
commit 408b2a955535e2c28a823d743ffd738375df4c46
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 23 10:55:28 2011 +0100

    Better fix for #3624 with NULL monitoring.

diff --git a/debian/changelog b/debian/changelog
index b34e658..3503576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proftpd-dfsg (1.3.3d-8) unstable; urgency=high
+
+  * debian/patches/3624 updated for a better management of possible NULL
+    value.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 23 Mar 2011 10:49:44 +0100
+
 proftpd-dfsg (1.3.3d-7) unstable; urgency=high
 
   * [SECURITY] new patch debian/patches/3624: this patch fixes the issue by
diff --git a/debian/patches/3624 b/debian/patches/3624
index 41e1fab..c3ebcfe 100644
--- a/debian/patches/3624
+++ b/debian/patches/3624
@@ -1,7 +1,7 @@
-Index: git/contrib/mod_tls.c
+Index: proftpd-dfsg/contrib/mod_tls.c
 ===================================================================
---- git.orig/contrib/mod_tls.c	2011-03-21 22:48:26.000000000 +0100
-+++ git/contrib/mod_tls.c	2011-03-21 22:52:10.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_tls.c	2011-03-23 10:49:05.000000000 +0100
++++ proftpd-dfsg/contrib/mod_tls.c	2011-03-23 10:49:24.000000000 +0100
 @@ -61,7 +61,7 @@
  # include <sys/mman.h>
  #endif
@@ -11,7 +11,7 @@ Index: git/contrib/mod_tls.c
  
  /* Make sure the version of proftpd is as necessary. */
  #if PROFTPD_VERSION_NUMBER < 0x0001021001 
-@@ -2758,11 +2758,29 @@
+@@ -2758,11 +2758,33 @@
  
    /* Stash the SSL object in the pointers of the correct NetIO streams. */
    if (conn == session.c) {
@@ -24,8 +24,10 @@ Index: git/contrib/mod_tls.c
 +     * in before the SSL/TLS handshake occurred (Bug#3624).
 +     */
 +    strm_buf = tls_ctrl_rd_nstrm->strm_buf;
-+    strm_buf->current = NULL;
-+    strm_buf->remaining = strm_buf->buflen;
++    if (strm_buf != NULL) {
++      strm_buf->current = NULL;
++      strm_buf->remaining = strm_buf->buflen;
++    }
 +
    } else if (conn == session.d) {
 +    pr_buffer_t *strm_buf;
@@ -36,8 +38,10 @@ Index: git/contrib/mod_tls.c
 +     * in before the SSL/TLS handshake occurred (Bug#3624).
 +     */
 +    strm_buf = tls_data_rd_nstrm->strm_buf;
-+    strm_buf->current = NULL;
-+    strm_buf->remaining = strm_buf->buflen;
++    if (strm_buf != NULL) {
++      strm_buf->current = NULL;
++      strm_buf->remaining = strm_buf->buflen;
++    }
    }
  
  #if OPENSSL_VERSION_NUMBER == 0x009080cfL

-- 
ProFTPD core package