From: Jeff Trawick <trawick@apache.org>
Date: Fri, 18 Jan 2002 21:38:12 +0000 (+0000)
Subject: Fix a segfault in mod_include which was found by Sander Striker using
X-Git-Tag: 2.0.31~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=897a0d3f3b928e8ac6193142978fef08ca1d1a5e;p=apache

Fix a segfault in mod_include which was found by Sander Striker using
an APR_POOL_DEBUG/ElectricFence build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92914 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index d2b1962554..41ea43cb0d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.31-dev
 
+  *) Fix a segfault in mod_include.  [Justin Erenkrantz, Jeff Trawick]
+
   *) Cause Win32 to capture all child-worker process errors in
      Apache to the main server error log, until the child can
      open its own error logs.  [William Rowe]
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 559ea38933..0d966d0f6b 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3063,7 +3063,8 @@ static apr_status_t send_parsed_content(apr_bucket_brigade **bb,
     }
 
     /* We have nothing more to send, stop now. */
-    if (APR_BUCKET_IS_EOS(dptr)) {
+    if (dptr != APR_BRIGADE_SENTINEL(*bb) &&
+        APR_BUCKET_IS_EOS(dptr)) {
         /* We might have something saved that we never completed, but send
          * down unparsed.  This allows for <!-- at the end of files to be
          * sent correctly. */