Telodendria/Cytoplasm
Telodendria/Cytoplasm
3
3
Fork 5
Code Issues 17 Pull requests 2 Projects Releases 2 Packages Activity Actions

Compare commits

base: Telodendria:39c25e5a17b0bb5baa321ca8e7551a001ec91ea1
Branches Tags
Telodendria:master
Telodendria:v0.4.1
Telodendria:v0.4.0
..
compare: Telodendria:4903c075e850d34bd704f188eb95b0f9e19e2579
Branches Tags
Telodendria:master
Telodendria:v0.4.1
Telodendria:v0.4.0

No commits in common. "39c25e5a17b0bb5baa321ca8e7551a001ec91ea1" and "4903c075e850d34bd704f188eb95b0f9e19e2579" have entirely different histories.
39c25e5a17 ... 4903c075e8

1 changed files with 6 additions and 8 deletions
Show stats Expand all files Collapse all files

14
src/Memory.c
View file

@ -40,12 +40,10 @@
#define MEMORY_HEXDUMP_WIDTH 16 #define MEMORY_HEXDUMP_WIDTH 16
#endif #endif
#define MEMORY_FILE_SIZE 256
struct MemoryInfo struct MemoryInfo
{ {
size_t size; size_t size;
char file[MEMORY_FILE_SIZE]; const char *file;
int line; int line;
void *pointer; void *pointer;
}; };
@ -229,7 +227,7 @@ MemoryAllocate(size_t size, const char *file, int line)
MEM_BOUND_UPPER(p, size) = MEM_BOUND; MEM_BOUND_UPPER(p, size) = MEM_BOUND;
a->size = MEM_SIZE_ACTUAL(size); a->size = MEM_SIZE_ACTUAL(size);
strncpy(a->file, file, MEMORY_FILE_SIZE - 1); a->file = file;
a->line = line; a->line = line;
a->pointer = p; a->pointer = p;
@ -272,7 +270,7 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
{ {
MemoryDelete(a); MemoryDelete(a);
a->size = MEM_SIZE_ACTUAL(size); a->size = MEM_SIZE_ACTUAL(size);
strncpy(a->file, file, MEMORY_FILE_SIZE - 1); a->file = file;
a->line = line; a->line = line;
a->pointer = new; a->pointer = new;
@ -295,7 +293,7 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
if (a) if (a)
{ {
a->size = 0; a->size = 0;
strncpy(a->file, file, MEMORY_FILE_SIZE - 1); a->file = file;
a->line = line; a->line = line;
a->pointer = p; a->pointer = p;
hook(MEMORY_BAD_POINTER, a, hookArgs); hook(MEMORY_BAD_POINTER, a, hookArgs);
@ -324,7 +322,7 @@ MemoryFree(void *p, const char *file, int line)
pthread_mutex_lock(&lock); pthread_mutex_lock(&lock);
if (hook) if (hook)
{ {
strncpy(a->file, file, MEMORY_FILE_SIZE - 1); a->file = file;
a->line = line; a->line = line;
hook(MEMORY_FREE, a, hookArgs); hook(MEMORY_FREE, a, hookArgs);
} }
@ -339,7 +337,7 @@ MemoryFree(void *p, const char *file, int line)
a = malloc(sizeof(MemoryInfo)); a = malloc(sizeof(MemoryInfo));
if (a) if (a)
{ {
strncpy(a->file, file, MEMORY_FILE_SIZE - 1); a->file = file;
a->line = line; a->line = line;
a->size = 0; a->size = 0;
a->pointer = p; a->pointer = p;