valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-08 02:18:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #380 from ga2arch/unique_ptr

Browse Source 
use unique_ptr instead of raw pointer
This commit is contained in:
Teddy Reed 2014-11-08 19:27:49 -08:00
commit 82a082e20e
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osquery/filesystem/filesystem.cpp
View File

@ -59,32 +59,27 @@ Status readFile(const boost::filesystem::path& path, std::string& content) {
int statusCode = 0;
std::string statusMessage = "OK";
char* buffer;
std::unique_ptr<char> buffer;
fs::ifstream file_h(path);
if (file_h) {
file_h.seekg(0, file_h.end);
int len = file_h.tellg();
file_h.seekg(0, file_h.beg);
buffer = new char[len];
file_h.read(buffer, len);
buffer = std::unique_ptr<char>(new char[len]);
file_h.read(buffer.get(), len);
if (!file_h) {
statusCode = 1;
statusMessage = "Could not read file";
goto cleanup_buffer;
}
content.assign(buffer, len);
content.assign(buffer.get(), len);
} else {
statusCode = 1;
statusMessage = "Could not open file for reading";
goto cleanup;
}
cleanup_buffer:
delete[] buffer;
cleanup:
if (file_h) {
file_h.close();
if (file_h) {
file_h.close();
}
}
return Status(statusCode, statusMessage);
}