diff options
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libcryptoutil/common/cryptoutil.h | 2 | ||||
| -rw-r--r-- | usr/src/lib/libdemangle/common/cxx.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/lib/libcryptoutil/common/cryptoutil.h b/usr/src/lib/libcryptoutil/common/cryptoutil.h index d5c67c48a4..714205550f 100644 --- a/usr/src/lib/libcryptoutil/common/cryptoutil.h +++ b/usr/src/lib/libcryptoutil/common/cryptoutil.h @@ -108,7 +108,7 @@ typedef struct uentry { boolean_t flag_metaslot_auto_key_migrate; CK_UTF8CHAR metaslot_ks_slot[SLOT_DESCRIPTION_SIZE + 1]; CK_UTF8CHAR metaslot_ks_token[TOKEN_LABEL_SIZE + 1]; - int count; + int count; boolean_t flag_fips_enabled; } uentry_t; diff --git a/usr/src/lib/libdemangle/common/cxx.c b/usr/src/lib/libdemangle/common/cxx.c index 66d7170544..e3b4c06a8a 100644 --- a/usr/src/lib/libdemangle/common/cxx.c +++ b/usr/src/lib/libdemangle/common/cxx.c @@ -210,11 +210,12 @@ cpp_demangle(const char *src, sysdem_ops_t *ops) if (nlen(&db) > 0) { str_t *s = TOP_L(&db); - result = zalloc(ops, s->str_len + 1); - if (result == NULL) + char *res = zalloc(ops, s->str_len + 1); + if (res == NULL) goto done; - (void) memcpy(result, s->str_s, s->str_len); + (void) memcpy(res, s->str_s, s->str_len); + result = res; } done: |