From 9a35b846dce2ca34e10ea9cb5d3b7836ef90e248 Mon Sep 17 00:00:00 2001 From: Dario Date: Fri, 17 Jan 2020 15:40:26 +0100 Subject: [PATCH] fix error, parameter return via string reference from static text --- src/cpp/controller/User.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/cpp/controller/User.cpp b/src/cpp/controller/User.cpp index 3e3b1bddf..82e74eea7 100644 --- a/src/cpp/controller/User.cpp +++ b/src/cpp/controller/User.cpp @@ -79,23 +79,17 @@ namespace controller { auto pubkey = getModel()->getPublicKey(); - if (pubkey) { + if (pubkey) + { auto pubkeyHex = mm->getFreeMemory(65); memset(*pubkeyHex, 0, 65); sodium_bin2hex(*pubkeyHex, 65, pubkey, 32); mPublicHex = (char*)*pubkeyHex; - mm->releaseMemory(pubkeyHex); - unlock(); - return mPublicHex; - } - else { - unlock(); - return ""; + mm->releaseMemory(pubkeyHex); } unlock(); - return ""; - + return mPublicHex; } Poco::JSON::Object User::getJson()