generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

size_t for buffer functions.

Browse Source 
Change BUF_MEM_grow and BUF_MEM_grow_clean to return size_t.
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2015-02-13 13:02:24 +00:00
parent d5ec8efc70
commit e5bf3c923c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/bio/bss_mem.c
View File

@@ -187,7 +187,7 @@ static int mem_write(BIO *b, const char *in, int inl)
BIO_clear_retry_flags(b); BIO_clear_retry_flags(b);
blen = bm->length; blen = bm->length;
if (BUF_MEM_grow_clean(bm, blen + inl) != (blen + inl)) if (BUF_MEM_grow_clean(bm, blen + inl) == 0)
goto end; goto end;
memcpy(&(bm->data[blen]), in, inl); memcpy(&(bm->data[blen]), in, inl);
ret = inl; ret = inl;

4
crypto/buffer/buffer.c
View File

@@ -94,7 +94,7 @@ void BUF_MEM_free(BUF_MEM *a)
OPENSSL_free(a); OPENSSL_free(a);
} }
int BUF_MEM_grow(BUF_MEM *str, size_t len) size_t BUF_MEM_grow(BUF_MEM *str, size_t len)
{ {
char *ret; char *ret;
size_t n; size_t n;
@@ -130,7 +130,7 @@ int BUF_MEM_grow(BUF_MEM *str, size_t len)
return (len); return (len);
} }
int BUF_MEM_grow_clean(BUF_MEM *str, size_t len) size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
{ {
char *ret; char *ret;
size_t n; size_t n;

4
crypto/buffer/buffer.h
View File

@@ -82,8 +82,8 @@ struct buf_mem_st {
BUF_MEM *BUF_MEM_new(void); BUF_MEM *BUF_MEM_new(void);
void BUF_MEM_free(BUF_MEM *a); void BUF_MEM_free(BUF_MEM *a);
int BUF_MEM_grow(BUF_MEM *str, size_t len); size_t BUF_MEM_grow(BUF_MEM *str, size_t len);
int BUF_MEM_grow_clean(BUF_MEM *str, size_t len); size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
size_t BUF_strnlen(const char *str, size_t maxlen); size_t BUF_strnlen(const char *str, size_t maxlen);
char *BUF_strdup(const char *str); char *BUF_strdup(const char *str);
char *BUF_strndup(const char *str, size_t siz); char *BUF_strndup(const char *str, size_t siz);