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

Side by Side Diff: tests/BadIcoTest.cpp

Issue 1757333002: Fix bug in SkGifCodec / Switch SkImageDec tests to use Codec (Closed) Base URL: https://skia.googlesource.com/skia.git@m50
Patch Set: Created 4 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/codec/SkGifCodec.cpp ('k') | tests/CachedDecodingPixelRefTest.cpp » ('j') | 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 "SkCodec.h"
12 #include "SkStream.h"
12 #include "SkOSFile.h" 13 #include "SkOSFile.h"
13 14
14 DEF_TEST(BadImage, reporter) { 15 DEF_TEST(BadImage, reporter) {
15 const char* const badImages [] = { 16 const char* const badImages [] = {
16 "sigabort_favicon.ico", 17 "sigabort_favicon.ico",
17 "sigsegv_favicon.ico", 18 "sigsegv_favicon.ico",
18 "sigsegv_favicon_2.ico", 19 "sigsegv_favicon_2.ico",
19 "ico_leak01.ico", 20 "ico_leak01.ico",
20 "ico_fuzz0.ico", 21 "ico_fuzz0.ico",
21 "ico_fuzz1.ico", 22 "ico_fuzz1.ico",
22 "skbug3442.webp", 23 "skbug3442.webp",
23 "skbug3429.webp", 24 "skbug3429.webp",
24 }; 25 };
25 26
26 const char* badImagesFolder = "invalid_images"; 27 const char* badImagesFolder = "invalid_images";
27 28
28 SkString resourcePath = GetResourcePath(badImagesFolder); 29 SkString resourcePath = GetResourcePath(badImagesFolder);
29 30
30 SkBitmap bm;
31 for (size_t i = 0; i < SK_ARRAY_COUNT(badImages); ++i) { 31 for (size_t i = 0; i < SK_ARRAY_COUNT(badImages); ++i) {
32 SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badImages[i]); 32 SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badImages[i]);
33 bool success = SkImageDecoder::DecodeFile(fullPath.c_str(), &bm); 33 SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fullPath.c_str()));
34 // These files are invalid, and should not decode. More importantly, 34 SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
35 // though, we reached here without crashing. 35
36 REPORTER_ASSERT(reporter, !success); 36 // These images are corrupt. It's not important whether we succeed/fail in codec
37 // creation or decoding. We just want to make sure that we don't crash.
38 if (codec) {
39 SkBitmap bm;
40 bm.allocPixels(codec->getInfo());
41 codec->getPixels(codec->getInfo(), bm.getPixels(),
42 bm.rowBytes());
43 }
37 } 44 }
38 } 45 }
OLDNEW
« no previous file with comments | « src/codec/SkGifCodec.cpp ('k') | tests/CachedDecodingPixelRefTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698