X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcmemory.c;h=b7f69df850e64e33bca5d273d9a85f69f055ecf5;hp=067cf1a38da069755112078a6d059a84287e876f;hb=e7b6c157b80152bf9fb9266e6bdd93f9fb0db776;hpb=b6cb90e6f0cc9767591f832b148822583b79fd3d

diff --git a/lib/silcutil/silcmemory.c b/lib/silcutil/silcmemory.c
index 067cf1a3..b7f69df8 100644
--- a/lib/silcutil/silcmemory.c
+++ b/lib/silcutil/silcmemory.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1999 - 2007 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
@@ -27,26 +27,40 @@
 void *silc_malloc(size_t size)
 {
   void *addr;
+
   if (silc_unlikely(size <= 0 || size >= SILC_MAX_ALLOC)) {
-    SILC_LOG_ERROR(("Invalid memory allocation, allocation by %x", size));
+    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, allocation by %x", size));
+    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;
 }
 
@@ -54,12 +68,18 @@ void *silc_realloc(void *ptr, size_t size)
 {
   void *addr;
   if (silc_unlikely(size <= 0 || size >= SILC_MAX_ALLOC)) {
-    SILC_LOG_ERROR(("Invalid memory allocation, allocation by %x", size));
+    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;
 }
 
@@ -71,9 +91,10 @@ void silc_free(void *ptr)
 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);
@@ -81,6 +102,11 @@ void *silc_memdup(const void *ptr, size_t size)
   return (void *)addr;
 }
 
+char *silc_strdup(const char *str)
+{
+  return silc_memdup(str, strlen(str));
+}
+
 #endif /* !SILC_STACKTRACE */
 
 /* SilcStack aware routines */
@@ -119,8 +145,20 @@ void *silc_scalloc(SilcStack stack, SilcUInt32 items, SilcUInt32 size)
 void *silc_srealloc(SilcStack stack, SilcUInt32 old_size,
 		    void *ptr, SilcUInt32 size)
 {
-  return stack ? silc_stack_realloc(stack, old_size, ptr, size) :
-    silc_realloc(ptr, size);
+  void *new_ptr;
+
+  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)