Changeset 2032

Show
Ignore:
Timestamp:
01/15/2008 11:27:52 PM (6 months ago)
Author:
glen
Message:

- Enforce use of ARRAY_STATIC_FREE instead of FOREACH(...); if (x->ptr) free(x->ptr); resolves #1515

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/mod_proxy_core_address.c

    r2031 r2032  
    3737        if (!address_pool) return; 
    3838 
    39         FOREACH(address_pool, proxy_address, element, proxy_address_free(element)); 
    40  
    41         if (address_pool->ptr) free(address_pool->ptr); 
     39        ARRAY_STATIC_FREE(address_pool, proxy_address, element, proxy_address_free(element)); 
    4240 
    4341        free(address_pool); 

  • trunk/src/mod_proxy_core_backend.c

    r1609 r2032  
    3737 
    3838void proxy_backends_free(proxy_backends *backends) { 
    39         FOREACH(backends, proxy_backend, element, proxy_backend_free(element)) 
    40  
    41         if (backends->ptr) free(backends->ptr); 
     39        if (!backends) return; 
     40         
     41        ARRAY_STATIC_FREE(backends, proxy_backend, element, proxy_backend_free(element)); 
    4242 
    4343        free(backends); 

  • trunk/src/mod_proxy_core_rewrites.c

    r1496 r2032  
    6262        if (!rewrites) return; 
    6363 
    64         FOREACH(rewrites, proxy_rewrite, rewrite, proxy_rewrite_free(rewrite)) 
    65  
    66         if (rewrites->ptr) free(rewrites->ptr); 
     64        ARRAY_STATIC_FREE(rewrites, proxy_rewrite, rewrite, proxy_rewrite_free(rewrite)); 
    6765 
    6866        free(rewrites);