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

Unified Diff: src/core/SkColorSpace.cpp

Issue 2079243003: Sanitize parsing of color look-up table (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkColorSpace.cpp
diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp
index ec8de725c129fdf79c400a1784771a2ab45eed81..267acf632192fd008b282e2c289ece9a251cd434 100644
--- a/src/core/SkColorSpace.cpp
+++ b/src/core/SkColorSpace.cpp
@@ -319,6 +319,17 @@ static bool safe_add(T arg1, T arg2, size_t* result) {
return false;
}
+static bool safe_mul(uint32_t arg1, uint32_t arg2, uint32_t* result) {
+ uint64_t product64 = (uint64_t) arg1 * (uint64_t) arg2;
+ uint32_t product32 = (uint32_t) product64;
+ if (product32 != product64) {
+ return false;
+ }
+
+ *result = product32;
+ return true;
+}
+
struct ICCTag {
uint32_t fSignature;
uint32_t fOffset;
@@ -662,6 +673,7 @@ bool load_color_lut(SkColorLookUpTable* colorLUT, uint32_t inputChannels, uint32
SkColorSpacePrintf("Color LUT tag is too small (%d bytes).", len);
return false;
}
+ size_t dataLen = len - 20;
kjlubick 2016/06/20 14:27:23 Where's the magic number 20 coming from?
msarett 2016/06/20 14:44:11 20 is the number of bytes preceding the actual col
SkASSERT(inputChannels <= SkColorLookUpTable::kMaxChannels && 3 == outputChannels);
colorLUT->fInputChannels = inputChannels;
@@ -669,9 +681,21 @@ bool load_color_lut(SkColorLookUpTable* colorLUT, uint32_t inputChannels, uint32
uint32_t numEntries = 1;
for (uint32_t i = 0; i < inputChannels; i++) {
colorLUT->fGridPoints[i] = src[i];
- numEntries *= src[i];
+ if (0 == src[i]) {
+ SkColorSpacePrintf("Each input channel must have at least one grid point.");
+ return false;
+ }
+
+ if (!safe_mul(numEntries, src[i], &numEntries)) {
+ SkColorSpacePrintf("Too many entries in Color LUT.");
+ return false;
+ }
+ }
+
+ if (!safe_mul(numEntries, outputChannels, &numEntries)) {
+ SkColorSpacePrintf("Too many entries in Color LUT.");
+ return false;
}
- numEntries *= outputChannels;
// Space is provided for a maximum of the 16 input channels. Now we determine the precision
// of the table values.
@@ -681,11 +705,17 @@ bool load_color_lut(SkColorLookUpTable* colorLUT, uint32_t inputChannels, uint32
case 2: // 16-bit data
break;
default:
- SkColorSpacePrintf("Color LUT precision must be 8-bit or 16-bit.\n", len);
+ SkColorSpacePrintf("Color LUT precision must be 8-bit or 16-bit.\n");
return false;
}
- if (len < 20 + numEntries * precision) {
+ uint32_t clutBytes;
+ if (!safe_mul(numEntries, precision, &clutBytes)) {
+ SkColorSpacePrintf("Too many entries in Color LUT.");
+ return false;
+ }
+
+ if (dataLen < clutBytes) {
SkColorSpacePrintf("Color LUT tag is too small (%d bytes).", len);
return false;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698