diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-05-15 15:36:02 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-05-15 15:36:02 -0700 |
| commit | d27acae33ff902ee85ae4f8ec76d4f64c294637b (patch) | |
| tree | 44506c7c78a15dfee730b2ff3e6e675e561b510a /fpdfsdk/src/fpdftext_embeddertest.cpp | |
| parent | b6e5df2eded21ca142adf43b4f78a9027589bfeb (diff) | |
| download | pdfium-d27acae33ff902ee85ae4f8ec76d4f64c294637b.tar.xz | |
Merge to XFA: Fix leaks in the embedder tests themselves.
Also change EmbedderTest::TearDown() to match the destruction order in
Chromium's PDF code.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1138143003
(cherry picked from commit 61ffad8df484ab9b3f7d2f5519ec470fbc023b88)
Review URL: https://codereview.chromium.org/1138973004
Diffstat (limited to 'fpdfsdk/src/fpdftext_embeddertest.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdftext_embeddertest.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp index 394e1a96b3..8384a41944 100644 --- a/fpdfsdk/src/fpdftext_embeddertest.cpp +++ b/fpdfsdk/src/fpdftext_embeddertest.cpp @@ -36,7 +36,7 @@ TEST_F(FPDFTextEmbeddertest, Text) { FPDF_TEXTPAGE textpage = FPDFText_LoadPage(page); EXPECT_NE(nullptr, textpage); - const char expected[] = "Hello, world!\r\nGoodbye, world!"; + static const char expected[] = "Hello, world!\r\nGoodbye, world!"; unsigned short fixed_buffer[128]; memset(fixed_buffer, 0xbd, sizeof(fixed_buffer)); @@ -134,6 +134,7 @@ TEST_F(FPDFTextEmbeddertest, Text) { EXPECT_EQ(0xbdbd, fixed_buffer[10]); FPDFText_ClosePage(textpage); + UnloadPage(page); } TEST_F(FPDFTextEmbeddertest, TextSearch) { @@ -239,6 +240,7 @@ TEST_F(FPDFTextEmbeddertest, TextSearch) { FPDFText_FindClose(search); FPDFText_ClosePage(textpage); + UnloadPage(page); } // Test that the page has characters despite a bad stream length. @@ -252,6 +254,7 @@ TEST_F(FPDFTextEmbeddertest, StreamLengthPastEndOfFile) { EXPECT_EQ(13, FPDFText_CountChars(textpage)); FPDFText_ClosePage(textpage); + UnloadPage(page); } TEST_F(FPDFTextEmbeddertest, WebLinks) { @@ -277,7 +280,7 @@ TEST_F(FPDFTextEmbeddertest, WebLinks) { EXPECT_EQ(25, FPDFLink_GetURL(pagelink, 0, nullptr, 0)); EXPECT_EQ(26, FPDFLink_GetURL(pagelink, 1, nullptr, 0)); - const char expected_url[] = "http://example.com?q=foo"; + static const char expected_url[] = "http://example.com?q=foo"; unsigned short fixed_buffer[128]; // Retrieve a link with too small a buffer. Buffer will not be @@ -358,4 +361,5 @@ TEST_F(FPDFTextEmbeddertest, WebLinks) { FPDFLink_CloseWebLinks(pagelink); FPDFText_ClosePage(textpage); + UnloadPage(page); } |