[prev in list] [next in list] [prev in thread] [next in thread] 

List:       proftpd-committers
Subject:    [ProFTPD-committers] proftpd/modules mod_log.c,1.122,1.123
From:       TJ Saunders <castaglia () users ! sourceforge ! net>
Date:       2011-09-24 19:12:20
Message-ID: E1R7Xe9-00088z-UQ () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/proftp/proftpd/modules
In directory vz-cvs-3.sog:/tmp/cvs-serv30084/modules

Modified Files:
	mod_log.c 
Log Message:

Guard against a possibly-null session.curr_cmd_rec pointer, when handling
the 'core.timeout-stalled' event in mod_log.


Index: mod_log.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/modules/mod_log.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- mod_log.c	21 Sep 2011 05:40:04 -0000	1.122
+++ mod_log.c	24 Sep 2011 19:12:17 -0000	1.123
@@ -1334,12 +1334,13 @@
 }
 
 static void log_xfer_stalled_ev(const void *event_data, void *user_data) {
-
-  /* Automatically dispatch the current command, at the LOG_CMD_ERR phase,
-   * so that the ExtendedLog entry for the command gets written out.  This
-   * should handle any LIST/MLSD/NLST commands as well (Bug#3696).
-   */
-  (void) pr_cmd_dispatch_phase(session.curr_cmd_rec, LOG_CMD_ERR, 0);
+  if (session.curr_cmd_rec != NULL) {
+    /* Automatically dispatch the current command, at the LOG_CMD_ERR phase,
+     * so that the ExtendedLog entry for the command gets written out.  This
+     * should handle any LIST/MLSD/NLST commands as well (Bug#3696).
+     */
+    (void) pr_cmd_dispatch_phase(session.curr_cmd_rec, LOG_CMD_ERR, 0);
+  }
 }
 
 /* Initialization handlers


------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
ProFTPD Committers Mailing List
proftpd-committers@proftpd.org
https://lists.sourceforge.net/lists/listinfo/proftp-committers
[prev in list] [next in list] [prev in thread] [next in thread]