Fix various incorrect error function codes.

[openssl.git] / crypto / buffer / buffer.c

diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index fcc153013b7ca83bf50d4f382686a9be8e4034cc..3bf03c7eff07f1056b583661c40f3eec4704ef46 100644 (file)
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -58,13 +58,13 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "buffer.h"
+#include <openssl/buffer.h>
 
 BUF_MEM *BUF_MEM_new(void)
        {
        BUF_MEM *ret;
 
-       ret=(BUF_MEM *)Malloc(sizeof(BUF_MEM));
+       ret=OPENSSL_malloc(sizeof(BUF_MEM));
        if (ret == NULL)
                {
                BUFerr(BUF_F_BUF_MEM_NEW,ERR_R_MALLOC_FAILURE);
@@ -84,9 +84,9 @@ void BUF_MEM_free(BUF_MEM *a)
        if (a->data != NULL)
                {
                memset(a->data,0,(unsigned int)a->max);
-               Free(a->data);
+               OPENSSL_free(a->data);
                }
-       Free(a);
+       OPENSSL_free(a);
        }
 
 int BUF_MEM_grow(BUF_MEM *str, int len)
@@ -101,15 +101,15 @@ int BUF_MEM_grow(BUF_MEM *str, int len)
                }
        if (str->max >= len)
                {
-               memset(&(str->data[str->length]),0,len-str->length);
+               memset(&str->data[str->length],0,len-str->length);
                str->length=len;
                return(len);
                }
        n=(len+3)/3*4;
        if (str->data == NULL)
-               ret=(char *)Malloc(n);
+               ret=OPENSSL_malloc(n);
        else
-               ret=(char *)Realloc(str->data,n);
+               ret=OPENSSL_realloc(str->data,n);
        if (ret == NULL)
                {
                BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
@@ -118,27 +118,104 @@ int BUF_MEM_grow(BUF_MEM *str, int len)
        else
                {
                str->data=ret;
+               str->max=n;
+               memset(&str->data[str->length],0,len-str->length);
                str->length=len;
+               }
+       return(len);
+       }
+
+int BUF_MEM_grow_clean(BUF_MEM *str, int len)
+       {
+       char *ret;
+       unsigned int n;
+
+       if (str->length >= len)
+               {
+               memset(&str->data[len],0,str->length-len);
+               str->length=len;
+               return(len);
+               }
+       if (str->max >= len)
+               {
+               memset(&str->data[str->length],0,len-str->length);
+               str->length=len;
+               return(len);
+               }
+       n=(len+3)/3*4;
+       if (str->data == NULL)
+               ret=OPENSSL_malloc(n);
+       else
+               ret=OPENSSL_realloc_clean(str->data,str->max,n);
+       if (ret == NULL)
+               {
+               BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
+               len=0;
+               }
+       else
+               {
+               str->data=ret;
                str->max=n;
+               memset(&str->data[str->length],0,len-str->length);
+               str->length=len;
                }
        return(len);
        }
 
 char *BUF_strdup(const char *str)
+       {
+       if (str == NULL) return(NULL);
+       return BUF_strndup(str, strlen(str));
+       }
+
+char *BUF_strndup(const char *str, size_t siz)
        {
        char *ret;
-       int n;
 
        if (str == NULL) return(NULL);
 
-       n=strlen(str);
-       ret=Malloc(n+1);
+       ret=OPENSSL_malloc(siz+1);
        if (ret == NULL) 
                {
-               BUFerr(BUF_F_BUF_STRDUP,ERR_R_MALLOC_FAILURE);
+               BUFerr(BUF_F_BUF_STRNDUP,ERR_R_MALLOC_FAILURE);
                return(NULL);
                }
-       memcpy(ret,str,n+1);
+       BUF_strlcpy(ret,str,siz+1);
        return(ret);
        }
 
+void *BUF_memdup(const void *data, size_t siz)
+       {
+       void *ret;
+
+       if (data == NULL) return(NULL);
+
+       ret=OPENSSL_malloc(siz);
+       if (ret == NULL) 
+               {
+               BUFerr(BUF_F_BUF_MEMDUP,ERR_R_MALLOC_FAILURE);
+               return(NULL);
+               }
+       return memcpy(ret, data, siz);
+       }       
+
+size_t BUF_strlcpy(char *dst, const char *src, size_t size)
+       {
+       size_t l = 0;
+       for(; size > 1 && *src; size--)
+               {
+               *dst++ = *src++;
+               l++;
+               }
+       if (size)
+               *dst = '\0';
+       return l + strlen(src);
+       }
+
+size_t BUF_strlcat(char *dst, const char *src, size_t size)
+       {
+       size_t l = 0;
+       for(; size > 0 && *dst; size--, dst++)
+               l++;
+       return l + BUF_strlcpy(dst, src, size);
+       }