Skip to content

Commit

Permalink
memory overlap tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@alperakcan
alperakcan committed Mar 29, 2013
1 parent da406d3 commit 70b633d
Show file tree
Hide file tree
Showing 5 changed files with 182 additions and 25 deletions.
132 changes: 109 additions & 23 deletions src/hmemory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,54 +94,64 @@ static pthread_mutex_t debugf_mutex = PTHREAD_MUTEX_INITIALIZER;

static pthread_mutex_t hmemory_mutex = PTHREAD_MUTEX_INITIALIZER;

static unsigned int hmemory_signature = 0xdeadbeef;
static unsigned int hmemory_signature_size = sizeof(hmemory_signature);

static inline int hmemory_getenv_int (const char *name);
static inline int debug_dump_callstack (const char *prefix);
static inline int debug_memory_add (const char *name, void *address, size_t size, const char *command, const char *func, const char *file, const int line);
static inline int debug_memory_check (void *address, const char *command, const char *func, const char *file, const int line);
static inline int debug_memory_overlap (void *s1, void *s2, size_t len, const char *command, const char *func, const char *file, const int line);
static inline int debug_memory_del (void *address, const char *command, const char *func, const char *file, const int line);

#else

static unsigned int hmemory_signature_size = 0;

#define debug_memory_unused() \
(void) func; \
(void) file; \
(void) line;
#define debug_memory_add(a...) (void) name; (void) command; debug_memory_unused()
#define debug_memory_del(a...) debug_memory_unused()
#define debug_memory_check(a...) debug_memory_unused()
#define debug_memory_overlap(a...) debug_memory_unused()

#endif

static unsigned int hmemory_signature = 0xdeadbeef;

static inline void * malloc_actual (const char *command, const char *func, const char *file, const int line, const char *name, size_t size)
{
void *rc;
size += sizeof(hmemory_signature) * 2;
size += hmemory_signature_size * 2;
rc = malloc(size);
if (rc == NULL) {
herrorf("malloc failed");
return NULL;
}
debug_memory_add(name, rc, size, command, func, file, line);
debug_memory_check(rc, command, func, file, line);
return rc + sizeof(hmemory_signature);
return rc + hmemory_signature_size;
}

static inline void free_actual (const char *command, const char *func, const char *file, const int line, void *address)
{
void *addr;
(void) command;
addr = address - sizeof(hmemory_signature);
addr = address - hmemory_signature_size;
debug_memory_check(addr, command, func, file, line);
debug_memory_del(addr, command, func, file, line);
free(addr);
}

void * HMEMORY_FUNCTION_NAME(memcpy_actual) (const char *func, const char *file, const int line, void *s1, void *s2, size_t len)
{
debug_memory_overlap(s1, s2, len, "memcpy", func, file, line);
return memcpy(s1, s2, len);
}

int HMEMORY_FUNCTION_NAME(asprintf_actual) (const char *func, const char *file, const int line, const char *name, char **strp, const char *fmt, ...)
{
int rc;
void *tmp;
va_list ap;
va_start(ap, fmt);
rc = vasprintf(strp, fmt, ap);
Expand All @@ -155,10 +165,18 @@ int HMEMORY_FUNCTION_NAME(asprintf_actual) (const char *func, const char *file,
hassert((rc >= 0) && "asprintf failed");
#endif
} else {
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
void *tmp;
tmp = malloc_actual("asprintf", func, file, line, name, strlen(*strp) + 1);
memcpy(tmp, *strp, strlen(*strp) + 1);
free(*strp);
*strp = tmp;
#else
(void) name;
(void) func;
(void) file;
(void) line;
#endif
}
va_end(ap);
return rc;
Expand All @@ -167,7 +185,6 @@ int HMEMORY_FUNCTION_NAME(asprintf_actual) (const char *func, const char *file,
int HMEMORY_FUNCTION_NAME(vasprintf_actual) (const char *func, const char *file, const int line, const char *name, char **strp, const char *fmt, va_list ap)
{
int rc;
void *tmp;
rc = vasprintf(strp, fmt, ap);
if (rc < 0) {
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
Expand All @@ -179,18 +196,25 @@ int HMEMORY_FUNCTION_NAME(vasprintf_actual) (const char *func, const char *file,
hassert((rc >= 0) && "vasprintf failed");
#endif
} else {
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
void *tmp;
tmp = malloc_actual("vasprintf", func, file, line, name, strlen(*strp) + 1);
memcpy(tmp, *strp, strlen(*strp) + 1);
free(*strp);
*strp = tmp;
#else
(void) name;
(void) func;
(void) file;
(void) line;
#endif
}
return rc;
}

char * HMEMORY_FUNCTION_NAME(strdup_actual) (const char *func, const char *file, const int line, const char *name, const char *string)
{
void *rc;
void *tmp;
if (string == NULL) {
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
hdebug_lock();
Expand All @@ -206,16 +230,27 @@ char * HMEMORY_FUNCTION_NAME(strdup_actual) (const char *func, const char *file,
if (rc == NULL) {
herrorf("strdup failed");
}
tmp = malloc_actual("strdup", func, file, line, name, strlen(rc) + 1);
memcpy(tmp, rc, strlen(rc) + 1);
free(rc);
return tmp;
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
{
void *tmp;
tmp = malloc_actual("strdup", func, file, line, name, strlen(rc) + 1);
memcpy(tmp, rc, strlen(rc) + 1);
free(rc);
rc = tmp;
}
#else
(void) name;
(void) func;
(void) file;
(void) line;
#endif
return rc;

}

char * HMEMORY_FUNCTION_NAME(strndup_actual) (const char *func, const char *file, const int line, const char *name, const char *string, size_t size)
{
void *rc;
void *tmp;
if (string == NULL) {
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
hdebug_lock();
Expand All @@ -231,10 +266,21 @@ char * HMEMORY_FUNCTION_NAME(strndup_actual) (const char *func, const char *file
if (rc == NULL) {
herrorf("strndup failed");
}
tmp = malloc_actual("strndup", func, file, line, name, strlen(rc) + 1);
memcpy(tmp, rc, strlen(rc) + 1);
free(rc);
return tmp;
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
{
void *tmp;
tmp = malloc_actual("strndup", func, file, line, name, strlen(rc) + 1);
memcpy(tmp, rc, strlen(rc) + 1);
free(rc);
rc = tmp;
}
#else
(void) name;
(void) func;
(void) file;
(void) line;
#endif
return rc;
}

void * HMEMORY_FUNCTION_NAME(malloc_actual) (const char *func, const char *file, const int line, const char *name, size_t size)
Expand All @@ -251,6 +297,7 @@ void * HMEMORY_FUNCTION_NAME(malloc_actual) (const char *func, const char *file,
void * HMEMORY_FUNCTION_NAME(calloc_actual) (const char *func, const char *file, const int line, const char *name, size_t nmemb, size_t size)
{
void *rc;
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
rc = malloc_actual("calloc", func, file, line, name, nmemb * size);
if (rc == NULL) {
herrorf("malloc actual failed");
Expand All @@ -261,12 +308,24 @@ void * HMEMORY_FUNCTION_NAME(calloc_actual) (const char *func, const char *file,
herrorf("memset actual failed");
return NULL;
}
#else
(void) name;
(void) func;
(void) file;
(void) line;
rc = calloc(nmemb, size);
if (rc == NULL) {
herrorf("calloc failed");
return NULL;
}
#endif
return rc;
}

void * HMEMORY_FUNCTION_NAME(realloc_actual) (const char *func, const char *file, const int line, const char *name, void *address, size_t size)
{
void *rc;
#if defined(HMEMORY_DEBUG) && (HMEMORY_DEBUG == 1)
void *tmp;
void *addr;
if (address == NULL) {
Expand All @@ -277,7 +336,7 @@ void * HMEMORY_FUNCTION_NAME(realloc_actual) (const char *func, const char *file
}
return rc;
}
addr = address - sizeof(hmemory_signature);
addr = address - hmemory_signature_size;
debug_memory_check(addr, "realloc", func, file, line);
rc = realloc(addr, size);
if (rc == NULL) {
Expand All @@ -288,7 +347,19 @@ void * HMEMORY_FUNCTION_NAME(realloc_actual) (const char *func, const char *file
tmp = malloc_actual("realloc", func, file, line, name, size);
memcpy(tmp, rc, size);
free(rc);
return tmp;
rc = tmp;
#else
(void) name;
(void) func;
(void) file;
(void) line;
rc = realloc(address, size);
if (rc == NULL) {
herrorf("realloc failed");
return NULL;
}
#endif
return rc;
}

void HMEMORY_FUNCTION_NAME(free_actual) (const char *func, const char *file, const int line, void *address)
Expand Down Expand Up @@ -509,8 +580,8 @@ static int debug_memory_add (const char *name, void *address, size_t size, const
m->func = func;
m->file = file;
m->line = line;
memcpy(m->address, &hmemory_signature, sizeof(hmemory_signature));
memcpy(m->address + m->size - sizeof(hmemory_signature), &hmemory_signature, sizeof(hmemory_signature));
memcpy(m->address, &hmemory_signature, hmemory_signature_size);
memcpy(m->address + m->size - hmemory_signature_size, &hmemory_signature, hmemory_signature_size);
HASH_ADD_PTR(debug_memory, address, m);
hdebugf("%s added memory: %s, address: %p, size: %zd, func: %s, file: %s, line: %d", command, m->name, m->address, m->size, m->func, m->file, m->line);
memory_total += size;
Expand Down Expand Up @@ -546,13 +617,13 @@ static int debug_memory_check_actual (void *address, const char *command, const
return -1;
found_m:
hdebug_lock();
rcu = memcmp(m->address, &hmemory_signature, sizeof(hmemory_signature));
rcu = memcmp(m->address, &hmemory_signature, hmemory_signature_size);
if (rcu != 0) {
hinfof("%s with corrupted address (%p), underflow", command, address);
hinfof(" at: %s (%s:%d)", func, file, line);
debug_dump_callstack(" ");
}
rco = memcmp(m->address + m->size - sizeof(hmemory_signature), &hmemory_signature, sizeof(hmemory_signature));
rco = memcmp(m->address + m->size - hmemory_signature_size, &hmemory_signature, hmemory_signature_size);
if (rco != 0) {
hinfof("%s with corrupted address (%p), overflow", command, address);
hinfof(" at: %s (%s:%d)", func, file, line);
Expand All @@ -571,6 +642,21 @@ static int debug_memory_check (void *address, const char *command, const char *f
return 0;
}

static int debug_memory_overlap (void *s1, void *s2, size_t len, const char *command, const char *func, const char *file, const int line)
{
void *e1;
e1 = s1 + len;
if (e1 > s2) {
hdebug_lock();
hinfof("%s with overlapping memory", command);
hinfof(" at: %s (%s:%d)", func, file, line);
debug_dump_callstack(" ");
hdebug_unlock();
hassert((e1 <= s2) && "memory overlap");
}
return 0;
}

static int debug_memory_del (void *address, const char *command, const char *func, const char *file, const int line)
{
struct hmemory_memory *m;
Expand Down
10 changes: 9 additions & 1 deletion src/hmemory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@

#define HMEMORY_DEBUG_NAME_MAX 256

#undef memcpy
#define memcpy(s1, s2, n) ({ \
void *__r; \
__r = hmemory_memcpy(s1, s2, n); \
__r; \
})

#undef asprintf
#define asprintf(strp, fmt...) ({ \
int __r; \
Expand Down Expand Up @@ -133,6 +140,8 @@

#endif

#define hmemory_memcpy(a, b, c) HMEMORY_FUNCTION_NAME(memcpy_actual)(__FUNCTION__, __FILE__, __LINE__, a, b, c)

#define hmemory_asprintf(a, b...) HMEMORY_FUNCTION_NAME(asprintf_actual)(__FUNCTION__, __FILE__, __LINE__, a, b)
#define hmemory_vasprintf(a, b, c) HMEMORY_FUNCTION_NAME(vasprintf_actual)(__FUNCTION__, __FILE__, __LINE__, a, b, c)

Expand All @@ -144,7 +153,6 @@
#define hmemory_realloc(a, b, c) HMEMORY_FUNCTION_NAME(realloc_actual)(__FUNCTION__, __FILE__, __LINE__, a, b, c)
#define hmemory_free(a) HMEMORY_FUNCTION_NAME(free_actual)(__FUNCTION__, __FILE__, __LINE__, a)

void * HMEMORY_FUNCTION_NAME(memset_actual) (const char *func, const char *file, const int line, void *destination, int c, size_t len);
void * HMEMORY_FUNCTION_NAME(memcpy_actual) (const char *func, const char *file, const int line, void *destination, void *source, size_t len);

int HMEMORY_FUNCTION_NAME(asprintf_actual) (const char *func, const char *file, const int line, const char *name, char **strp, const char *fmt, ...);
Expand Down
7 changes: 6 additions & 1 deletion test/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ unit tests behaviours and expected results
00-19: leak tests
20-39: invalid address
40-59: memory corruption
60-79: memory overlap

success fail
------------------------------------ ------------------------------------
Expand Down Expand Up @@ -79,4 +80,8 @@ unit tests behaviours and expected results
sleep: 3 sleep: 3
free: rc ** memory corruption **
exit


60 rc = malloc: 1024 rc = malloc: 1024
memmove: rc, rc + 10, 100 memcpy: rc, rc + 10, 100
free: rc ** memory overlap **
exit
29 changes: 29 additions & 0 deletions test/fail-60.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright (c) 2008-2013 Alper Akcan <[email protected]>
*
* This program is free software. It comes without any warranty, to
* the extent permitted by applicable law. You can redistribute it
* and/or modify it under the terms of the Do What The Fuck You Want
* To Public License, Version 2, as published by Sam Hocevar. See
* http://www.wtfpl.net/ for more details.
*/

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

int main (int argc, char *argv[])
{
void *rc;
(void) argc;
(void) argv;
rc = malloc(1024);
if (rc == NULL) {
fprintf(stderr, "malloc failed\n");
exit(-1);
}
memcpy(rc, rc + 10, 100);
free(rc);
return 0;
}
Loading

0 comments on commit 70b633d

Please sign in to comment.