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

Side by Side Diff: tests/BadIcoTest.cpp

Issue 996173005: Ico security issues fix (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: actually fixed it this time Created 5 years, 9 months 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 unified diff | Download patch
« no previous file with comments | « src/images/SkImageDecoder_libico.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "Resources.h" 8 #include "Resources.h"
9 #include "Test.h" 9 #include "Test.h"
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
11 #include "SkImageDecoder.h" 11 #include "SkImageDecoder.h"
12 #include "SkOSFile.h" 12 #include "SkOSFile.h"
13 13
14 DEF_TEST(BadIco, reporter) { 14 DEF_TEST(BadIco, reporter) {
15 const char* const badIcos [] = { 15 const char* const badIcos [] = {
16 "sigabort_favicon.ico", 16 "sigabort_favicon.ico",
17 "sigsegv_favicon.ico", 17 "sigsegv_favicon.ico",
18 "sigsegv_favicon_2.ico", 18 "sigsegv_favicon_2.ico",
19 "ico_leak01.ico",
20 "ico_fuzz0.ico",
21 "ico_fuzz1.ico"
19 }; 22 };
20 23
21 const char* badIcoFolder = "invalid_images"; 24 const char* badIcoFolder = "invalid_images";
22 25
23 SkString resourcePath = GetResourcePath(badIcoFolder); 26 SkString resourcePath = GetResourcePath(badIcoFolder);
24 27
25 SkBitmap bm; 28 SkBitmap bm;
26 for (size_t i = 0; i < SK_ARRAY_COUNT(badIcos); ++i) { 29 for (size_t i = 0; i < SK_ARRAY_COUNT(badIcos); ++i) {
27 SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badIcos[i]); 30 SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badIcos[i]);
28 bool success = SkImageDecoder::DecodeFile(fullPath.c_str(), &bm); 31 bool success = SkImageDecoder::DecodeFile(fullPath.c_str(), &bm);
29 // These files are invalid, and should not decode. More importantly, 32 // These files are invalid, and should not decode. More importantly,
30 // though, we reached here without crashing. 33 // though, we reached here without crashing.
31 REPORTER_ASSERT(reporter, !success); 34 REPORTER_ASSERT(reporter, !success);
32 } 35 }
33 } 36 }
OLDNEW
« no previous file with comments | « src/images/SkImageDecoder_libico.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698