Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(965)

Unified Diff: ppapi/tests/test_char_set.cc

Issue 8486018: ppapi: Fix memory leaks in TestCharSetToUTF16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove suppressions. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/test_char_set.cc
diff --git a/ppapi/tests/test_char_set.cc b/ppapi/tests/test_char_set.cc
index 05e32c975758b1f5617792841389e3a04a928053..868c3503bbeb4bcf40ca8fa2c24db05751d21d22 100644
--- a/ppapi/tests/test_char_set.cc
+++ b/ppapi/tests/test_char_set.cc
@@ -103,6 +103,8 @@ std::string TestCharSet::TestUTF16ToCharSet() {
}
std::string TestCharSet::TestCharSetToUTF16() {
+ pp::Memory_Dev memory;
+
// Empty string.
uint32_t utf16result_len;
uint16_t* utf16result = char_set_interface_->CharSetToUTF16(
@@ -111,6 +113,7 @@ std::string TestCharSet::TestCharSetToUTF16() {
ASSERT_TRUE(utf16result);
ASSERT_TRUE(utf16result_len == 0);
ASSERT_TRUE(utf16result[0] == 0);
+ memory.MemFree(utf16result);
// Basic Latin1.
char latin1[] = "H\xef";
@@ -121,6 +124,7 @@ std::string TestCharSet::TestCharSetToUTF16() {
ASSERT_TRUE(utf16result_len == 2);
ASSERT_TRUE(utf16result[0] == 'H' && utf16result[1] == 0xef &&
utf16result[2] == 0);
+ memory.MemFree(utf16result);
// Invalid input encoding with FAIL.
char badutf8[] = "A\xe4Z";
@@ -129,6 +133,7 @@ std::string TestCharSet::TestCharSetToUTF16() {
PP_CHARSET_CONVERSIONERROR_FAIL, &utf16result_len);
ASSERT_TRUE(!utf16result);
ASSERT_TRUE(utf16result_len == 0);
+ memory.MemFree(utf16result);
// Invalid input with SKIP.
utf16result = char_set_interface_->CharSetToUTF16(
@@ -138,6 +143,7 @@ std::string TestCharSet::TestCharSetToUTF16() {
ASSERT_TRUE(utf16result_len == 2);
ASSERT_TRUE(utf16result[0] == 'A' && utf16result[1] == 'Z' &&
utf16result[2] == 0);
+ memory.MemFree(utf16result);
// Invalid input with SUBSTITUTE.
utf16result = char_set_interface_->CharSetToUTF16(
@@ -147,6 +153,7 @@ std::string TestCharSet::TestCharSetToUTF16() {
ASSERT_TRUE(utf16result_len == 3);
ASSERT_TRUE(utf16result[0] == 'A' && utf16result[1] == 0xFFFD &&
utf16result[2] == 'Z' && utf16result[3] == 0);
+ memory.MemFree(utf16result);
// Invalid encoding name.
utf16result = char_set_interface_->CharSetToUTF16(
@@ -154,6 +161,7 @@ std::string TestCharSet::TestCharSetToUTF16() {
PP_CHARSET_CONVERSIONERROR_SUBSTITUTE, &utf16result_len);
ASSERT_TRUE(!utf16result);
ASSERT_TRUE(utf16result_len == 0);
+ memory.MemFree(utf16result);
PASS();
}
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698