denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some code cleanups

Browse Source
This commit is contained in:
Martin Willi
2008-04-03 10:22:17 +00:00
parent 84b18d5fc7
commit 6c45e62242
1 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/leak_detective.c
+13 -39
View File
@@ -426,29 +426,17 @@ void free_hook(void *ptr, const void *caller)
count_free++; count_free++;
uninstall_hooks(); uninstall_hooks();
if (hdr->magic != MEMORY_HEADER_MAGIC) if (hdr->magic != MEMORY_HEADER_MAGIC ||
tail->magic != MEMORY_TAIL_MAGIC)
{ {
fprintf(stderr, "freeing memory with corrupted header " fprintf(stderr, "freeing invalid memory (%p): "
"(%p, MAGIC 0x%x != 0x%x):\n", "header magic 0x%x, tail magic 0x%x:\n",
ptr, hdr->magic, MEMORY_HEADER_MAGIC); ptr, hdr->magic, tail->magic);
stack_frame_count = backtrace(stack_frames, STACK_FRAMES_COUNT); stack_frame_count = backtrace(stack_frames, STACK_FRAMES_COUNT);
log_stack_frames(stack_frames, stack_frame_count); log_stack_frames(stack_frames, stack_frame_count);
install_hooks();
pthread_setschedparam(thread_id, oldpolicy, &params);
return;
} }
if (tail->magic != MEMORY_TAIL_MAGIC) else
{ {
fprintf(stderr, "freeing memory with corrupted tail "
"(%p, MAGIC 0x%x != 0x%x):\n",
ptr, tail->magic, MEMORY_TAIL_MAGIC);
stack_frame_count = backtrace(stack_frames, STACK_FRAMES_COUNT);
log_stack_frames(stack_frames, stack_frame_count);
install_hooks();
pthread_setschedparam(thread_id, oldpolicy, &oldparams);
return;
}
/* remove item from list */ /* remove item from list */
if (hdr->next) if (hdr->next)
{ {
@@ -460,8 +448,9 @@ void free_hook(void *ptr, const void *caller)
memset(hdr, MEMORY_FREE_PATTERN, hdr->bytes + sizeof(memory_header_t)); memset(hdr, MEMORY_FREE_PATTERN, hdr->bytes + sizeof(memory_header_t));
free(hdr); free(hdr);
install_hooks(); }
install_hooks();
pthread_setschedparam(thread_id, oldpolicy, &params); pthread_setschedparam(thread_id, oldpolicy, &params);
} }
@@ -494,29 +483,14 @@ void *realloc_hook(void *old, size_t bytes, const void *caller)
count_realloc++; count_realloc++;
uninstall_hooks(); uninstall_hooks();
if (hdr->magic != MEMORY_HEADER_MAGIC) if (hdr->magic != MEMORY_HEADER_MAGIC ||
tail->magic != MEMORY_TAIL_MAGIC)
{ {
fprintf(stderr, "reallocating memory with corrupted header " fprintf(stderr, "reallocating invalid memory (%p): "
"(%p, MAGIC 0x%x != 0x%x):\n", "header magic 0x%x, tail magic 0x%x:\n",
old, hdr->magic, MEMORY_HEADER_MAGIC); old, hdr->magic, tail->magic);
stack_frame_count = backtrace(stack_frames, STACK_FRAMES_COUNT); stack_frame_count = backtrace(stack_frames, STACK_FRAMES_COUNT);
log_stack_frames(stack_frames, stack_frame_count); log_stack_frames(stack_frames, stack_frame_count);
install_hooks();
pthread_setschedparam(thread_id, oldpolicy, &oldparams);
raise(SIGKILL);
return NULL;
}
if (tail->magic != MEMORY_TAIL_MAGIC)
{
fprintf(stderr, "reallocating memory with corrupted tail "
"(%p, MAGIC 0x%x != 0x%x):\n",
old, tail->magic, MEMORY_TAIL_MAGIC);
stack_frame_count = backtrace(stack_frames, STACK_FRAMES_COUNT);
log_stack_frames(stack_frames, stack_frame_count);
install_hooks();
pthread_setschedparam(thread_id, oldpolicy, &oldparams);
raise(SIGKILL);
return NULL;
} }
/* clear tail magic, allocate, set tail magic */ /* clear tail magic, allocate, set tail magic */
memset(&tail->magic, MEMORY_ALLOC_PATTERN, sizeof(tail->magic)); memset(&tail->magic, MEMORY_ALLOC_PATTERN, sizeof(tail->magic));