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

List:       apr-cvs
Subject:    svn commit: r1914764 - /apr/apr/trunk/buckets/apr_brigade.c
From:       jorton () apache ! org
Date:       2023-12-19 9:04:07
Message-ID: 20231219090407.5F82617A15F () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: jorton
Date: Tue Dec 19 09:04:07 2023
New Revision: 1914764

URL: http://svn.apache.org/viewvc?rev=1914764&view=rev
Log:
* buckets/apr_brigade.c (apr_brigade_split_line): Replace ad-hoc
  brigade memory corruption test with APR_BRIGADE_CHECK_CONSISTENCY.

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=1914764&r1=1914763&r2=1914764&view=diff
 ==============================================================================
--- apr/apr/trunk/buckets/apr_brigade.c (original)
+++ apr/apr/trunk/buckets/apr_brigade.c Tue Dec 19 09:04:07 2023
@@ -336,7 +336,8 @@ APR_DECLARE(apr_status_t) apr_brigade_sp
                                                  apr_off_t maxbytes)
 {
     apr_off_t readbytes = 0;
-    apr_bucket *prev = NULL;
+
+    APR_BRIGADE_CHECK_CONSISTENCY(bbIn);
 
     while (!APR_BRIGADE_EMPTY(bbIn)) {
         const char *pos;
@@ -346,10 +347,6 @@ APR_DECLARE(apr_status_t) apr_brigade_sp
         apr_bucket *e;
 
         e = APR_BRIGADE_FIRST(bbIn);
-        if (e == prev) {         /* PR#51062: prevent infinite loop on a corrupt \
                brigade */
-            return APR_EGENERAL; /* FIXME: this should definitely be a "can't \
                happen"!   */
-        }
-        prev = e;
         rv = apr_bucket_read(e, &str, &len, block);
 
         if (rv != APR_SUCCESS) {


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