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

Implement BUF_strnlen() and use it instead of strlen().

Browse Source
This commit is contained in:
Ben Laurie
2014-05-21 11:54:54 +01:00
parent a2219f6be3
commit ed693e4332
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/buffer/buf_str.c
View File

@@ -60,6 +60,16 @@
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/buffer.h> #include <openssl/buffer.h>
size_t BUF_strnlen(const char *str, size_t maxlen)
{
const char *p;
for (p = str; *p != '\0' && maxlen-- != 0; ++p)
;
return p - str;
}
char *BUF_strdup(const char *str) char *BUF_strdup(const char *str)
{ {
if (str == NULL) return(NULL); if (str == NULL) return(NULL);
@@ -73,7 +83,7 @@ char *BUF_strndup(const char *str, size_t siz)
if (str == NULL) return(NULL); if (str == NULL) return(NULL);
len = strlen(str); len = BUF_strnlen(str, siz);
if (siz > len) if (siz > len)
siz = len; siz = len;

1
crypto/buffer/buffer.h
View File

@@ -85,6 +85,7 @@ 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); int BUF_MEM_grow(BUF_MEM *str, size_t len);
int BUF_MEM_grow_clean(BUF_MEM *str, size_t len); int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
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);
void * BUF_memdup(const void *data, size_t siz); void * BUF_memdup(const void *data, size_t siz);