You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2020/03/11 17:30:52 UTC
svn commit: r1875098 - /apr/apr/trunk/buckets/apr_brigade.c
Author: jorton
Date: Wed Mar 11 17:30:51 2020
New Revision: 1875098
URL: http://svn.apache.org/viewvc?rev=1875098&view=rev
Log:
* buckets/apr_brigade.c (apr_brigade_cleanup): Non-debug builds should
not check for brigade memory corruption; debug builds should abort
rather than fail silently (since all callers ignore the rv) if
corruption is detected.
Modified:
apr/apr/trunk/buckets/apr_brigade.c
Modified: apr/apr/trunk/buckets/apr_brigade.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_brigade.c?rev=1875098&r1=1875097&r2=1875098&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_brigade.c (original)
+++ apr/apr/trunk/buckets/apr_brigade.c Wed Mar 11 17:30:51 2020
@@ -37,6 +37,14 @@ static apr_status_t brigade_cleanup(void
APR_DECLARE(apr_status_t) apr_brigade_cleanup(void *data)
{
apr_bucket_brigade *b = data;
+
+#ifndef APR_BUCKET_DEBUG
+ while (!APR_BRIGADE_EMPTY(b)) {
+ apr_bucket_delete(APR_BRIGADE_FIRST(b));
+ }
+#else
+ /* Debugging version with checks which will only trigger if the
+ * bucket list becomes corrupt. */
apr_bucket *e;
apr_bucket *prev = NULL;
@@ -44,12 +52,12 @@ APR_DECLARE(apr_status_t) apr_brigade_cl
while (!APR_BRIGADE_EMPTY(b)) {
e = APR_BRIGADE_FIRST(b);
- if (e == prev) { /* PR#51062: prevent infinite loop on a corrupt brigade */
- return APR_EGENERAL; /* FIXME: this should definitely be a "can't happen"! */
- }
+ assert(e != prev);
prev = e;
apr_bucket_delete(e);
}
+#endif
+
/* We don't need to free(bb) because it's allocated from a pool. */
return APR_SUCCESS;
}