widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor file_store to use smart pointers

Browse Source 
Bug: b/119276649
Merge of http://go/wvgerrit/68903
Test: Android + Linux unit tests

The FileSystem interface as it exists expects an Open for a file and
then a Close when finished. However, the Close doesn't delete the file
itself and depending on the platform, the underlying impl_ as well,
leading to a memory leak. To fix this leak as well as harden against
future memory issues, this change refactors the interface to shift away
from raw pointers and towards smart pointers.

Change-Id: I7a7132ea95cd3775796a540f510b698f4f27dd24
This commit is contained in:
Srujan Gaddam
2018-11-14 16:59:00 -08:00
parent 75dedd20bd
commit 5ec8923b85
14 changed files with 338 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libwvdrmengine/cdm/test/file_utils_unittest.cpp
View File

@@ -2,6 +2,7 @@
// source code may only be used and distributed under the Widevine Master
// License Agreement.
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "file_store.h"
@@ -64,9 +65,8 @@ TEST_F(FileUtilsTest, CreateDirectory) {
TEST_F(FileUtilsTest, IsDir) {
std::string path = test_vectors::kTestDir + kTestFileName;
File* file = file_system.Open(path, FileSystem::kCreate);
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate);
EXPECT_TRUE(file);
file->Close();
EXPECT_TRUE(file_system.Exists(path));
EXPECT_TRUE(file_system.Exists(test_vectors::kTestDir));
@@ -76,9 +76,8 @@ TEST_F(FileUtilsTest, IsDir) {
TEST_F(FileUtilsTest, IsRegularFile) {
std::string path = test_vectors::kTestDir + kTestFileName;
File* file = file_system.Open(path, FileSystem::kCreate);
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate);
EXPECT_TRUE(file);
file->Close();
EXPECT_TRUE(file_system.Exists(path));
EXPECT_TRUE(file_system.Exists(test_vectors::kTestDir));
@@ -91,10 +90,11 @@ TEST_F(FileUtilsTest, CopyFile) {
file_system.Remove(path);
std::string write_data = GenerateRandomData(600);
File* wr_file = file_system.Open(path, FileSystem::kCreate);
size_t write_data_size = write_data.size();
std::unique_ptr<File> wr_file = file_system.Open(path, FileSystem::kCreate);
EXPECT_TRUE(wr_file);
EXPECT_TRUE(wr_file->Write(write_data.data(), write_data.size()));
wr_file->Close();
EXPECT_EQ(wr_file->Write(write_data.data(), write_data_size),
write_data_size);
ASSERT_TRUE(file_system.Exists(path));
std::string path_copy = test_vectors::kTestDir + kTestFileName2;
@@ -103,10 +103,11 @@ TEST_F(FileUtilsTest, CopyFile) {
std::string read_data;
read_data.resize(file_system.FileSize(path_copy));
File* rd_file = file_system.Open(path_copy, FileSystem::kReadOnly);
size_t read_data_size = read_data.size();
std::unique_ptr<File> rd_file =
file_system.Open(path_copy, FileSystem::kReadOnly);
EXPECT_TRUE(rd_file);
EXPECT_TRUE(rd_file->Read(&read_data[0], read_data.size()));
rd_file->Close();
EXPECT_EQ(rd_file->Read(&read_data[0], read_data_size), read_data_size);
EXPECT_EQ(write_data, read_data);
EXPECT_EQ(file_system.FileSize(path), file_system.FileSize(path_copy));
}
@@ -123,18 +124,18 @@ TEST_F(FileUtilsTest, ListFiles) {
path = test_vectors::kTestDir + kTestFileName;
std::string write_data = GenerateRandomData(600);
File* file = file_system.Open(path, FileSystem::kCreate);
size_t write_data_size = write_data.size();
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate);
EXPECT_TRUE(file);
EXPECT_TRUE(file->Write(write_data.data(), write_data.size()));
file->Close();
EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size);
EXPECT_TRUE(file_system.Exists(path));
path = test_vectors::kTestDir + kTestFileName2;
write_data = GenerateRandomData(600);
write_data_size = write_data.size();
file = file_system.Open(path, FileSystem::kCreate);
EXPECT_TRUE(file);
EXPECT_TRUE(file->Write(write_data.data(), write_data.size()));
file->Close();
EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size);
EXPECT_TRUE(file_system.Exists(path));
std::vector<std::string> files;