Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1999 - 2006 Pekka Riikonen
+ Copyright (C) 1999 - 2008 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
void *silc_malloc(size_t size)
{
void *addr;
+
if (silc_unlikely(size <= 0 || size >= SILC_MAX_ALLOC)) {
- SILC_LOG_ERROR(("Invalid memory allocation"));
+ if (size == 0)
+ silc_set_errno_nofail(SILC_ERR_ZERO_ALLOCATION);
+ else
+ silc_set_errno_reason_nofail(SILC_ERR_TOO_LARGE_ALLOCATION,
+ "Allocation by %d", size);
return NULL;
}
+
addr = malloc(size);
if (silc_unlikely(!addr))
- SILC_LOG_ERROR(("System out of memory"));
+ silc_set_errno_nofail(SILC_ERR_OUT_OF_MEMORY);
+
return addr;
}
void *silc_calloc(size_t items, size_t size)
{
void *addr;
+
if (silc_unlikely(size * items <= 0 || size * items >= SILC_MAX_ALLOC)) {
- SILC_LOG_ERROR(("Invalid memory allocation"));
+ if (size == 0)
+ silc_set_errno_nofail(SILC_ERR_ZERO_ALLOCATION);
+ else
+ silc_set_errno_reason_nofail(SILC_ERR_TOO_LARGE_ALLOCATION,
+ "Allocation by %d", size);
return NULL;
}
+
addr = calloc(items, size);
if (silc_unlikely(!addr))
- SILC_LOG_ERROR(("System out of memory"));
+ silc_set_errno_nofail(SILC_ERR_OUT_OF_MEMORY);
+
return addr;
}
{
void *addr;
if (silc_unlikely(size <= 0 || size >= SILC_MAX_ALLOC)) {
- SILC_LOG_ERROR(("Invalid memory allocation"));
+ if (size == 0)
+ silc_set_errno_nofail(SILC_ERR_ZERO_ALLOCATION);
+ else
+ silc_set_errno_reason_nofail(SILC_ERR_TOO_LARGE_ALLOCATION,
+ "Allocation by %d", size);
return NULL;
}
+
addr = realloc(ptr, size);
if (silc_unlikely(!addr))
- SILC_LOG_ERROR(("System out of memory"));
+ silc_set_errno_nofail(SILC_ERR_OUT_OF_MEMORY);
+
return addr;
}
void *silc_memdup(const void *ptr, size_t size)
{
unsigned char *addr;
+
addr = silc_malloc(size + 1);
if (silc_unlikely(!addr)) {
- SILC_LOG_ERROR(("System out of memory"));
+ silc_set_errno_nofail(SILC_ERR_OUT_OF_MEMORY);
return NULL;
}
memcpy((void *)addr, ptr, size);
return (void *)addr;
}
+char *silc_strdup(const char *str)
+{
+ return silc_memdup(str, strlen(str));
+}
+
#endif /* !SILC_STACKTRACE */
/* SilcStack aware routines */
void *silc_smalloc(SilcStack stack, SilcUInt32 size)
{
- return stack ? silc_stack_malloc(stack, size, TRUE) : silc_malloc(size);
+ return stack ? silc_stack_malloc(stack, size) : silc_malloc(size);
}
-void *silc_smalloc_ua(SilcStack stack, SilcUInt32 size)
+void silc_sfree(SilcStack stack, void *ptr)
{
- return stack ? silc_stack_malloc(stack, size, FALSE) : silc_malloc(size);
+ if (stack) {
+#ifdef SILC_DEBUG
+ if (ptr)
+ *(unsigned char *)ptr = 'F';
+#endif /* SILC_DEBUG */
+ return;
+ }
+ silc_free(ptr);
}
void *silc_scalloc(SilcStack stack, SilcUInt32 items, SilcUInt32 size)
if (!stack)
return silc_calloc(items, size);
- addr = silc_stack_malloc(stack, items * size, TRUE);
+ addr = silc_stack_malloc(stack, items * size);
if (silc_unlikely(!addr))
return NULL;
memset(addr, 0, items * size);
void *silc_srealloc(SilcStack stack, SilcUInt32 old_size,
void *ptr, SilcUInt32 size)
{
- return stack ? silc_stack_realloc(stack, old_size, ptr, size, TRUE) :
- silc_realloc(ptr, size);
-}
+ void *new_ptr;
-void *silc_srealloc_ua(SilcStack stack, SilcUInt32 old_size,
- void *ptr, SilcUInt32 size)
-{
- return stack ? silc_stack_realloc(stack, old_size, ptr, size, FALSE) :
- silc_realloc(ptr, size);
+ if (!stack)
+ return silc_realloc(ptr, size);
+
+ new_ptr = silc_stack_realloc(stack, old_size, ptr, size);
+ if (!new_ptr) {
+ new_ptr = silc_smalloc(stack, size);
+ if (!new_ptr)
+ return NULL;
+ memcpy(new_ptr, ptr, old_size > size ? size : old_size);
+ }
+
+ return new_ptr;
}
void *silc_smemdup(SilcStack stack, const void *ptr, SilcUInt32 size)
if (!stack)
return silc_memdup(ptr, size);
- addr = silc_stack_malloc(stack, size + 1, TRUE);
+ addr = silc_stack_malloc(stack, size + 1);
if (silc_unlikely(!addr))
return NULL;
memcpy((void *)addr, ptr, size);
if (!stack)
return silc_memdup(str, size);
- addr = silc_stack_malloc(stack, size + 1, FALSE);
+ addr = silc_stack_malloc(stack, size + 1);
if (silc_unlikely(!addr))
return NULL;
memcpy((void *)addr, str, size);