From cf024ded050d3d42a5321b60b3c7c672a7f86f57 Mon Sep 17 00:00:00 2001 From: brectanus Date: Mon, 5 Mar 2007 22:12:34 +0000 Subject: [PATCH] Fix segfault when logging NULL text during request reading errors and upcoming fix for sending alerts on such errors. --- apache2/msc_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apache2/msc_util.c b/apache2/msc_util.c index 8117e712..3284b390 100644 --- a/apache2/msc_util.c +++ b/apache2/msc_util.c @@ -428,11 +428,11 @@ unsigned char *c2x(unsigned what, unsigned char *where) { } char *log_escape(apr_pool_t *mp, const char *text) { - return _log_escape(mp, (const unsigned char *)text, strlen(text), 1, 0); + return _log_escape(mp, (const unsigned char *)text, text ? strlen(text) : 0, 1, 0); } char *log_escape_nq(apr_pool_t *mp, const char *text) { - return _log_escape(mp, (const unsigned char *)text, strlen(text), 0, 0); + return _log_escape(mp, (const unsigned char *)text, text ? strlen(text) : 0, 0, 0); } char *log_escape_ex(apr_pool_t *mp, const char *text, unsigned long int text_length) { @@ -444,7 +444,7 @@ char *log_escape_nq_ex(apr_pool_t *mp, const char *text, unsigned long int text_ } char *log_escape_header_name(apr_pool_t *mp, const char *text) { - return _log_escape(mp, (const unsigned char *)text, strlen(text), 0, 1); + return _log_escape(mp, (const unsigned char *)text, text ? strlen(text) : 0, 0, 1); } /**