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

List:       apr-cvs
Subject:    svn commit: r1875097 - /apr/apr/trunk/include/apr_buckets.h
From:       jorton () apache ! org
Date:       2020-03-11 17:21:24
Message-ID: 20200311172124.1A30817AE52 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: jorton
Date: Wed Mar 11 17:21:23 2020
New Revision: 1875097

URL: http://svn.apache.org/viewvc?rev=1875097&view=rev
Log:
* include/apr_buckets.h: Ensure macro argument is only expanded
  once for apr_bucket_delete and apr_bucket_destroy.

Modified:
    apr/apr/trunk/include/apr_buckets.h

Modified: apr/apr/trunk/include/apr_buckets.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_buckets.h?rev=1875097&r1=1875096&r2=1875097&view=diff
 ==============================================================================
--- apr/apr/trunk/include/apr_buckets.h (original)
+++ apr/apr/trunk/include/apr_buckets.h Wed Mar 11 17:21:23 2020
@@ -1030,8 +1030,9 @@ APR_DECLARE_NONSTD(void) apr_bucket_free
  * @param e The bucket to destroy
  */
 #define apr_bucket_destroy(e) do {					\
-        (e)->type->destroy((e)->data);					\
-        (e)->free(e);							\
+        apr_bucket *apr__d = (e);					\
+        apr__d->type->destroy(apr__d->data);			       	\
+        apr__d->free(apr__d);						\
     } while (0)
 
 /**
@@ -1046,8 +1047,9 @@ APR_DECLARE_NONSTD(void) apr_bucket_free
  * @param e The bucket to delete
  */
 #define apr_bucket_delete(e) do {					\
-        APR_BUCKET_REMOVE(e);						\
-        apr_bucket_destroy(e);						\
+        apr_bucket *apr__b = (e);					\
+        APR_BUCKET_REMOVE(apr__b);					\
+        apr_bucket_destroy(apr__b);					\
     } while (0)
 
 /**


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