diff options
author | jsing <> | 2017-04-09 14:33:21 +0000 |
---|---|---|
committer | jsing <> | 2017-04-09 14:33:21 +0000 |
commit | 978d8c2620ea265519c6ba475c5ea70385b3f7e7 (patch) | |
tree | b7538ad973e758d6d761ca0da816cbbe471d4095 | |
parent | 3a517e45fb024ec0afef7012f9e1c118b8e72389 (diff) | |
download | openbsd-978d8c2620ea265519c6ba475c5ea70385b3f7e7.tar.gz openbsd-978d8c2620ea265519c6ba475c5ea70385b3f7e7.tar.bz2 openbsd-978d8c2620ea265519c6ba475c5ea70385b3f7e7.zip |
Explicitly test for NULL.
ok beck@
-rw-r--r-- | src/lib/libcrypto/buffer/buf_str.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/buffer/buf_str.c b/src/lib/libcrypto/buffer/buf_str.c index a9ab87a09f..4ebc4717c8 100644 --- a/src/lib/libcrypto/buffer/buf_str.c +++ b/src/lib/libcrypto/buffer/buf_str.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: buf_str.c,v 1.10 2017/01/29 17:49:22 beck Exp $ */ | 1 | /* $OpenBSD: buf_str.c,v 1.11 2017/04/09 14:33:21 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Bob Beck | 3 | * Copyright (c) 2014 Bob Beck |
4 | * | 4 | * |
@@ -34,7 +34,7 @@ BUF_strdup(const char *str) | |||
34 | char *ret = NULL; | 34 | char *ret = NULL; |
35 | 35 | ||
36 | if (str != NULL) { | 36 | if (str != NULL) { |
37 | if (!(ret = strdup(str))) | 37 | if ((ret = strdup(str)) == NULL) |
38 | BUFerror(ERR_R_MALLOC_FAILURE); | 38 | BUFerror(ERR_R_MALLOC_FAILURE); |
39 | } | 39 | } |
40 | return ret; | 40 | return ret; |
@@ -46,7 +46,7 @@ BUF_strndup(const char *str, size_t siz) | |||
46 | char *ret = NULL; | 46 | char *ret = NULL; |
47 | 47 | ||
48 | if (str != NULL) { | 48 | if (str != NULL) { |
49 | if (!(ret = strndup(str, siz))) | 49 | if ((ret = strndup(str, siz)) == NULL) |
50 | BUFerror(ERR_R_MALLOC_FAILURE); | 50 | BUFerror(ERR_R_MALLOC_FAILURE); |
51 | } | 51 | } |
52 | return ret; | 52 | return ret; |
@@ -58,7 +58,7 @@ BUF_memdup(const void *data, size_t siz) | |||
58 | void *ret = NULL; | 58 | void *ret = NULL; |
59 | 59 | ||
60 | if (data != NULL) { | 60 | if (data != NULL) { |
61 | if (!(ret = malloc(siz))) | 61 | if ((ret = malloc(siz)) == NULL) |
62 | BUFerror(ERR_R_MALLOC_FAILURE); | 62 | BUFerror(ERR_R_MALLOC_FAILURE); |
63 | else | 63 | else |
64 | (void) memcpy(ret, data, siz); | 64 | (void) memcpy(ret, data, siz); |