From d65d061a2a47299a664f2b607dba32ca8621cf0b Mon Sep 17 00:00:00 2001 From: Kyungwook Tak Date: Mon, 21 Mar 2016 20:55:45 +0900 Subject: [PATCH] Change char unique_ptr to char vector char vector can free resource naturally than unique_ptr which should use delete [] explicitly by destructor. Related SVACE defect id : 56526, 56527 Vericiation: ckm-tests-internal --run_test=ENCRYPTION_SCHEME_TEST Change-Id: I508192c49557b9f980556e7a20d589be37390b3b Signed-off-by: Kyungwook Tak --- tests/encryption-scheme/scheme-test.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/encryption-scheme/scheme-test.cpp b/tests/encryption-scheme/scheme-test.cpp index abb6538..47d1569 100644 --- a/tests/encryption-scheme/scheme-test.cpp +++ b/tests/encryption-scheme/scheme-test.cpp @@ -32,6 +32,7 @@ #include #include +#include #include @@ -263,10 +264,9 @@ uid_t getUid(const char *name) { memset(&pwd, 0x00, sizeof(pwd)); - std::unique_ptr buf(new char[bufsize]); - BOOST_REQUIRE_MESSAGE(buf, "failed to allocate mem for buf for getpwname_r"); + std::vector buf(bufsize, 0); - int ret = getpwnam_r(name, &pwd, buf.get(), bufsize, &result); + int ret = getpwnam_r(name, &pwd, buf.data(), bufsize, &result); BOOST_REQUIRE_MESSAGE(ret == 0 && result, "getpwnam_r failed"); return pwd.pw_uid; @@ -281,10 +281,9 @@ gid_t getGid(const char *name) { memset(&grp, 0x00, sizeof(grp)); - std::unique_ptr buf(new char[bufsize]); - BOOST_REQUIRE_MESSAGE(buf, "failed to allocate mem for buf for getgrnam_r"); + std::vector buf(bufsize, 0); - int ret = getgrnam_r(name, &grp, buf.get(), bufsize, &result); + int ret = getgrnam_r(name, &grp, buf.data(), bufsize, &result); BOOST_REQUIRE_MESSAGE(ret == 0 && result, "getgrnam_r failed"); return grp.gr_gid; -- 2.7.4