diff options
| author | Andre Heinecke <[email protected]> | 2016-10-14 14:23:57 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-10-14 14:23:57 +0000 |
| commit | 1e8c34a9192956bb2fe96a7a6a76ff59de8d1c0c (patch) | |
| tree | 2a2725d29633a5e76116e14ee56d4750238b6c02 | |
| parent | python: Make 'get_key' more idiomatic. (diff) | |
| download | gpgme-1e8c34a9192956bb2fe96a7a6a76ff59de8d1c0c.tar.gz gpgme-1e8c34a9192956bb2fe96a7a6a76ff59de8d1c0c.zip | |
cpp: Fix init of string from null
* lang/cpp/src/key.cpp (UserID::addrSpecFromString): Check return
value before creating the string.
| -rw-r--r-- | lang/cpp/src/key.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp index 947405fb..235a3c8e 100644 --- a/lang/cpp/src/key.cpp +++ b/lang/cpp/src/key.cpp @@ -884,9 +884,12 @@ std::string UserID::addrSpecFromString(const char *userid) return std::string(); } char *normalized = gpgme_addrspec_from_uid (userid); - std::string ret(normalized); - gpgme_free(normalized); - return ret; + if (normalized) { + std::string ret(normalized); + gpgme_free(normalized); + return ret; + } + return std::string(); } std::string UserID::addrSpec() const |