bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added the debugging_(malloc|calloc|free) functions to help track memory

Browse Source 
usage. There are also now defines for safe(malloc|calloc|free) which allow
for debugging code to be enabled or not.
This commit is contained in:
Robert James Kaes 2001-09-08 18:55:58 +00:00
parent b8a694e7a3
commit 4923dd22a7
2 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/utils.c
View File

@ -1,4 +1,4 @@
/* $Id: utils.c,v 1.9 2001-09-07 04:21:07 rjkaes Exp $ /* $Id: utils.c,v 1.10 2001-09-08 18:55:58 rjkaes Exp $
* *
* Misc. routines which are used by the various functions to handle strings * Misc. routines which are used by the various functions to handle strings
* and memory allocation and pretty much anything else we can think of. Also, * and memory allocation and pretty much anything else we can think of. Also,
@ -30,6 +30,34 @@
#include "sock.h" #include "sock.h"
#include "utils.h" #include "utils.h"
/*
* These are the debugging calloc, malloc, and free versions
*/
#ifndef NDEBUG
void *debugging_calloc(size_t nmemb, size_t size, const char *file, unsigned long line)
{
void *ptr = calloc(nmemb, size);
fprintf(stderr, "{calloc: %p:%u x %u} %s:%lu\n", ptr, nmemb, size, file, line);
return ptr;
}
void *debugging_malloc(size_t size, const char *file, unsigned long line)
{
void *ptr = malloc(size);
fprintf(stderr, "{malloc: %p:%u} %s:%lu\n", ptr, size, file, line);
return ptr;
}
void debugging_free(void *ptr, const char *file, unsigned long line)
{
fprintf(stderr, "{free: %p} %s:%lu\n", ptr, file, line);
free(ptr);
return;
}
#endif
/* /*
* Display an error to the client. * Display an error to the client.
*/ */
@ -60,13 +88,13 @@ int httperr(struct conn_s *connptr, int err, const char *msg)
char timebuf[30]; char timebuf[30];
time_t global_time; time_t global_time;
header_buffer = malloc(HEADER_SIZE); header_buffer = safemalloc(HEADER_SIZE);
if (!header_buffer) { if (!header_buffer) {
log_message(LOG_ERR, "Could not allocate memory."); log_message(LOG_ERR, "Could not allocate memory.");
return -1; return -1;
} }
message_buffer = malloc(MAXBUFFSIZE); message_buffer = safemalloc(MAXBUFFSIZE);
if (!message_buffer) { if (!message_buffer) {
log_message(LOG_ERR, "Could not allocate memory."); log_message(LOG_ERR, "Could not allocate memory.");
safefree(header_buffer); safefree(header_buffer);
@ -80,7 +108,7 @@ int httperr(struct conn_s *connptr, int err, const char *msg)
snprintf(header_buffer, HEADER_SIZE - 1, headers, err, msg, PACKAGE, VERSION, timebuf, strlen(message_buffer)); snprintf(header_buffer, HEADER_SIZE - 1, headers, err, msg, PACKAGE, VERSION, timebuf, strlen(message_buffer));
output_size = strlen(message_buffer) + strlen(header_buffer); output_size = strlen(message_buffer) + strlen(header_buffer);
connptr->output_message = malloc(output_size + 1); connptr->output_message = safemalloc(output_size + 1);
if (!connptr->output_message) { if (!connptr->output_message) {
log_message(LOG_ERR, "Could not allocate memory."); log_message(LOG_ERR, "Could not allocate memory.");
safefree(header_buffer); safefree(header_buffer);

20
src/utils.h
View File

@ -1,4 +1,4 @@
/* $Id: utils.h,v 1.6 2001-08-30 16:52:56 rjkaes Exp $ /* $Id: utils.h,v 1.7 2001-09-08 18:55:58 rjkaes Exp $
* *
* See 'utils.h' for a detailed description. * See 'utils.h' for a detailed description.
* *
@ -34,4 +34,22 @@ extern size_t strlcat(char *dst, const char *src, size_t size);
extern size_t strlcpy(char *dst, const char *src, size_t size); extern size_t strlcpy(char *dst, const char *src, size_t size);
#endif /* HAVE_STRLCPY */ #endif /* HAVE_STRLCPY */
/*
* The following is to allow for better memory checking.
*/
#ifndef NDEBUG
extern void *debugging_calloc(size_t nmemb, size_t size, const char *file, unsigned long line);
extern void *debugging_malloc(size_t size, const char *file, unsigned long line);
extern void debugging_free(void *ptr, const char *file, unsigned long line);
# define safecalloc(x, y) debugging_calloc(x, y, __FILE__, __LINE__)
# define safemalloc(x) debugging_malloc(x, __FILE__, __LINE__)
# define safefree(x) debugging_free(x, __FILE__, __LINE__)
#else
# define safecalloc(x, y) calloc(x, y)
# define safemalloc(x) malloc(x)
# define safefree(x) free(x)
#endif
#endif #endif