diff options
| author |   doug <doug@openbsd.org> | 2015-04-29 01:16:06 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-04-29 01:16:06 +0000 |
| commit | 1f4d25518eebe5e0e239f9f2026567bfd63d8e2a (patch) | |
| tree | f208d215da2832277d5b1c3324e546238ece4298 /lib/libssl/bs_cbs.c | |
| parent | Add missing #include <stdint.h> for SIZE_MAX (diff) | |
| download | wireguard-openbsd-1f4d25518eebe5e0e239f9f2026567bfd63d8e2a.tar.xz wireguard-openbsd-1f4d25518eebe5e0e239f9f2026567bfd63d8e2a.zip | |
free() can handle NULL.
ok jsing@
Diffstat (limited to 'lib/libssl/bs_cbs.c')
| -rw-r--r-- | lib/libssl/bs_cbs.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/libssl/bs_cbs.c b/lib/libssl/bs_cbs.c index d7c0977cf3f..25305b9edd2 100644 --- a/lib/libssl/bs_cbs.c +++ b/lib/libssl/bs_cbs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bs_cbs.c,v 1.3 2015/04/25 15:28:47 doug Exp $ */ +/* $OpenBSD: bs_cbs.c,v 1.4 2015/04/29 01:16:06 doug Exp $ */ /* * Copyright (c) 2014, Google Inc. * @@ -65,10 +65,8 @@ CBS_len(const CBS *cbs) int CBS_stow(const CBS *cbs, uint8_t **out_ptr, size_t *out_len) { - if (*out_ptr != NULL) { - free(*out_ptr); - *out_ptr = NULL; - } + free(*out_ptr); + *out_ptr = NULL; *out_len = 0; if (cbs->len == 0) @@ -85,9 +83,7 @@ CBS_stow(const CBS *cbs, uint8_t **out_ptr, size_t *out_len) int CBS_strdup(const CBS *cbs, char **out_ptr) { - if (*out_ptr != NULL) - free(*out_ptr); - + free(*out_ptr); *out_ptr = strndup((const char*)cbs->data, cbs->len); return (*out_ptr != NULL); } |