Further synchronisation with Unix

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

diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index 9299baba9e2d5de688fca19cfd889da68c012ef8..b3e947771d5850246f571457bdce1f4d328650c0 100644 (file)
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -125,21 +125,39 @@ int BUF_MEM_grow(BUF_MEM *str, int len)
        return(len);
        }
 
-char *BUF_strdup(const char *str)
+int BUF_MEM_grow_clean(BUF_MEM *str, int len)
        {
        char *ret;
-       int n;
-
-       if (str == NULL) return(NULL);
+       unsigned int n;
 
-       n=strlen(str);
-       ret=OPENSSL_malloc(n+1);
-       if (ret == NULL) 
+       if (str->length >= len)
                {
-               BUFerr(BUF_F_BUF_STRDUP,ERR_R_MALLOC_FAILURE);
-               return(NULL);
+               memset(&str->data[len],0,str->length-len);
+               str->length=len;
+               return(len);
                }
-       memcpy(ret,str,n+1);
-       return(ret);
+       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);
        }
-