DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

If Color constructor is passed a value > 0xFFFFFFFF, Sky crashes

Browse Source 
We now ensure the color is <= 0xFFFFFFFF.

Fixes #245

R=ianh@google.com

Review URL: https://codereview.chromium.org/1179413008.
This commit is contained in:
Adam Barth 2015-06-18 10:32:26 -07:00
parent 7c4662ce2c
commit 381c19e075
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/core/painting/Color.dart
View File

@ -5,12 +5,12 @@
part of dart.sky;
class Color {
const Color(this._value);
const Color(int value) : _value = (value & 0xFFFFFFFF);
const Color.fromARGB(int a, int r, int g, int b) :
_value = (((a & 0xff) << 24) |
((r & 0xff) << 16) |
((g & 0xff) << 8) |
((b & 0xff) << 0));
_value = ((((a & 0xff) << 24) |
((r & 0xff) << 16) |
((g & 0xff) << 8) |
((b & 0xff) << 0)) & 0xFFFFFFFF);
final int _value;
int get value => _value;

8
tests/raw/color_bounds-expected.txt Normal file
View File

@ -0,0 +1,8 @@
CONSOLE: unittest-suite-wait-for-done
CONSOLE: PASS: paint set to black
CONSOLE: PASS: color created with out of bounds value
CONSOLE: PASS: color created with wildly out of bounds value
CONSOLE:
CONSOLE: All 3 tests passed.
CONSOLE: unittest-suite-success
DONE

35
tests/raw/color_bounds.dart Normal file
View File

@ -0,0 +1,35 @@
import 'dart:sky' as sky;
import '../resources/third_party/unittest/unittest.dart';
import '../resources/unit.dart';
void main() {
initUnit();
test("paint set to black", () {
sky.Color c = new sky.Color(0x00000000);
sky.Paint p = new sky.Paint();
p.color = c;
expect(c.toString(), equals('Color(0x00000000)'));
});
test("color created with out of bounds value", () {
try {
sky.Color c = new sky.Color(0x100 << 24);
sky.Paint p = new sky.Paint();
p.color = c;
} catch (e) {
expect(e != null, equals(true));
}
});
test("color created with wildly out of bounds value", () {
try {
sky.Color c = new sky.Color(1 << 1000000);
sky.Paint p = new sky.Paint();
p.color = c;
} catch (e) {
expect(e != null, equals(true));
}
});
}