Commit 4ab02751 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Add wrappers for malloc, calloc, realloc that check for out of memory 

situations.  Use them in most places where malloc, and friends are used.
This results in clean error messages in an out of memory situation instead of
segfaulting or silently malfunctioning. In some places, it just allows to
remove some logging code.

PR 51568, PR 51569, PR 51571.


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

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ Changes with Apache 2.3.15 
     PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener,

     <lowprio20 gmail.com>]



  *) Add wrappers for malloc, calloc, realloc that check for out of memory

     situations and use them in many places. PR 51568, PR 51569, PR 51571.

     [Stefan Fritsch]



  *) Fix cross-compilation of mod_cgi/mod_cgid when APR_HAVE_STRUCT_RLIMIT is 

     false but RLIMIT_* are defined.  PR51371. [Eric Covener]

include/ap_config.h

+8 −0
Changes for include/ap_config.h: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -182,4 +182,12 @@ 
#define ap_func_attr_sentinel

#endif



#if ( defined(__GNUC__) &&                                        \

      (__GNUC__ >= 4 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 4))) \

    || __has_attribute(warn_unused_result)

#define ap_func_attr_warn_unused_result   __attribute__((warn_unused_result))

#else

#define ap_func_attr_warn_unused_result

#endif



#endif /* AP_CONFIG_H */

include/ap_mmn.h

+3 −1
Changes for include/ap_mmn.h: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -352,6 +352,8 @@ 
 * 20110724.5 (2.3.15-dev) add ap_set_accept_ranges()

 * 20110724.6 (2.3.15-dev) add max_overlaps and max_reversals to core_dir_config

 * 20110724.7 (2.3.15-dev) add ap_random_insecure_bytes(), ap_random_pick()

 * 20110724.8 (2.3.15-dev) add ap_abort_on_oom(), ap_malloc(), ap_calloc(),

 *                         ap_realloc()

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -359,7 +361,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20110724

#endif

#define MODULE_MAGIC_NUMBER_MINOR 7                    /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 8                    /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

include/httpd.h

+32 −0
Changes for include/httpd.h: 32 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2086,6 +2086,38 @@ AP_DECLARE(void) ap_random_insecure_bytes(void *buf, apr_size_t size); 
 */

AP_DECLARE(apr_uint32_t) ap_random_pick(apr_uint32_t min, apr_uint32_t max);



/**

 * Abort with a error message signifying out of memory

 */

AP_DECLARE(void) ap_abort_on_oom(void) __attribute__((noreturn));



/**

 * Wrapper for malloc() that calls ap_abort_on_oom() if out of memory

 * @param size size of the memory block

 * @return pointer to the allocated memory

 * @note ap_malloc may be implemented as a macro

 */

AP_DECLARE(void *) ap_malloc(size_t size) __attribute__((malloc));



/**

 * Wrapper for calloc() that calls ap_abort_on_oom() if out of memory

 * @param nelem number of elements to allocate memory for

 * @param size size of a single element

 * @return pointer to the allocated memory

 * @note ap_calloc may be implemented as a macro

 */

AP_DECLARE(void *) ap_calloc(size_t nelem, size_t size) __attribute__((malloc));



/**

 * Wrapper for realloc() that calls ap_abort_on_oom() if out of memory

 * @param ptr pointer to the old memory block (or NULL)

 * @param size new size of the memory block

 * @return pointer to the reallocated memory

 * @note ap_realloc may be implemented as a macro

 */

AP_DECLARE(void *) ap_realloc(void *ptr, size_t size)

                   ap_func_attr_warn_unused_result;





#define AP_NORESTART APR_OS_START_USEERR + 1

modules/cache/cache_cache.c

+1 −1
Changes for modules/cache/cache_cache.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ cache_cache_t* cache_init(int max_entries, 
                                         cache_cache_free *free_entry)

{

    cache_cache_t *tmp;

    tmp = malloc(sizeof(cache_cache_t));

    tmp = ap_malloc(sizeof(cache_cache_t));

    tmp->max_entries = max_entries;

    tmp->max_size = max_size;

    tmp->current_size = 0;