Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add strict overflow checks for uint and int types #237

Closed
wants to merge 1 commit into from
Closed

Add strict overflow checks for uint and int types #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
264 changes: 264 additions & 0 deletions tests/test-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,267 @@ describe('Test Base64 coder', function() {
assert.equal(utf8.toUtf8String(base64.decode(encoded)), decodedText, 'decodes from base64 sstring');
});
});


describe('Test coderNumber', function() {
var coder = utils.abiCoder.defaultCoder;
describe('uint8', function() {
describe('encode', function() {
function testUint8Encode(input, expected) {
var encoded = coder.encode(['uint8'], [input]);
assert.equal(encoded.toString('hex'), expected.toString('hex'));
}
it('min value', function() {
testUint8Encode(
'0',
'0x0000000000000000000000000000000000000000000000000000000000000000'
);
});
it('middle value', function() {
testUint8Encode(
'12',
'0x000000000000000000000000000000000000000000000000000000000000000c'
);
});
it('max value', function() {
testUint8Encode(
'255',
'0x00000000000000000000000000000000000000000000000000000000000000ff'
);
});
it('throws for min value - 1', function() {
var input = '-1';
assert.throws(() => coder.encode(['uint8'], [input]));
});
it('throws for max value + 1', function() {
var input = '256';
assert.throws(() => coder.encode(['uint8'], [input]));
});
});
describe('decode', function() {
function testUint8Decode(encoded, expected) {
var decoded = coder.decode(['uint8'], encoded);
assert.equal(decoded.toString(), expected);
}
it('min value', function() {
testUint8Decode(
'0x0000000000000000000000000000000000000000000000000000000000000000',
'0'
);
});
it('middle value', function() {
testUint8Decode(
'0x000000000000000000000000000000000000000000000000000000000000000c',
'12'
);
});
it('max value', function() {
testUint8Decode(
'0x00000000000000000000000000000000000000000000000000000000000000ff',
'255'
);
});
});
});
describe('uint256', function() {
describe('encode', function() {
function testUint256Encode(input, expected) {
var encoded = coder.encode(['uint256'], [input]);
assert.equal(encoded.toString('hex'), expected.toString('hex'));
}
it('min value', function() {
testUint256Encode(
'0',
'0x0000000000000000000000000000000000000000000000000000000000000000'
);
});
it('middle value', function() {
testUint256Encode(
'123456789',
'0x00000000000000000000000000000000000000000000000000000000075bcd15'
);
});
it('max value', function() {
testUint256Encode(
'115792089237316195423570985008687907853269984665640564039457584007913129639935',
'0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'
);
});
it('throws for min value - 1', function() {
var input = '-1';
assert.throws(() => coder.encode(['uint256'], [input]));
});
it('throws for max value + 1', function() {
var input =
'115792089237316195423570985008687907853269984665640564039457584007913129639936';
assert.throws(() => coder.encode(['uint256'], [input]));
});
});
describe('decode', function() {
function testUint256Decode(encoded, expected) {
var decoded = coder.decode(['uint256'], encoded);
assert.equal(decoded.toString(), expected);
}
it('min value', function() {
testUint256Decode(
'0x0000000000000000000000000000000000000000000000000000000000000000',
'0'
);
});
it('middle value', function() {
testUint256Decode(
'0x00000000000000000000000000000000000000000000000000000000075bcd15',
'123456789'
);
});
it('max value', function() {
testUint256Decode(
'0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
'115792089237316195423570985008687907853269984665640564039457584007913129639935'
);
});
});
});
describe('int8', function() {
describe('encode', function() {
function testInt8Encode(input, expected) {
var encoded = coder.encode(['int8'], [input]);
assert.equal(encoded.toString('hex'), expected.toString('hex'));
}
it('min value', function() {
testInt8Encode(
'-128',
'0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80'
);
});
it('negative middle value', function() {
testInt8Encode(
'-12',
'0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4'
);
});
it('middle value', function() {
testInt8Encode(
'12',
'0x000000000000000000000000000000000000000000000000000000000000000c'
);
});
it('max value', function() {
testInt8Encode(
'127',
'0x000000000000000000000000000000000000000000000000000000000000007f'
);
});
it('throws for min value - 1', function() {
var input = '-129';
assert.throws(() => coder.encode(['int8'], [input]));
});
it('throws for max value + 1', function() {
var input = '128';
assert.throws(() => coder.encode(['int8'], [input]));
});
});
describe('decode', function() {
function testInt8Decode(encoded, expected) {
var decoded = coder.decode(['int8'], encoded);
assert.equal(decoded.toString(), expected);
}
it('min value', function() {
testInt8Decode(
'0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80',
'-128'
);
});
it('negative middle value', function() {
testInt8Decode(
'0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4',
'-12'
);
});
it('middle value', function() {
testInt8Decode(
'0x000000000000000000000000000000000000000000000000000000000000000c',
'12'
);
});
it('max value', function() {
testInt8Decode(
'0x000000000000000000000000000000000000000000000000000000000000007f',
'127'
);
});
});
});
describe('int256', function() {
describe('encode', function() {
function testInt256Encode(input, expected) {
var encoded = coder.encode(['int256'], [input]);
assert.equal(encoded.toString('hex'), expected.toString('hex'));
}
it('min value', function() {
testInt256Encode(
'-57896044618658097711785492504343953926634992332820282019728792003956564819968',
'0x8000000000000000000000000000000000000000000000000000000000000000'
);
});
it('negative middle value', function() {
testInt256Encode(
'-123456789',
'0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffff8a432eb'
);
});
it('middle value', function() {
testInt256Encode(
'123456789',
'0x00000000000000000000000000000000000000000000000000000000075bcd15'
);
});
it('max value', function() {
testInt256Encode(
'57896044618658097711785492504343953926634992332820282019728792003956564819967',
'0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'
);
});
it('throws for min value - 1', function() {
var input =
'-57896044618658097711785492504343953926634992332820282019728792003956564819969';
assert.throws(() => coder.encode(['int256'], [input]));
});
it('throws for max value + 1', function() {
var input =
'57896044618658097711785492504343953926634992332820282019728792003956564819968';
assert.throws(() => coder.encode(['int256'], [input]));
});
});
describe('decode', function() {
function testInt256Decode(encoded, expected) {
var decoded = coder.decode(['int256'], encoded);
assert.equal(decoded.toString(), expected);
}
it('min value', function() {
testInt256Decode(
'0x8000000000000000000000000000000000000000000000000000000000000000',
'-57896044618658097711785492504343953926634992332820282019728792003956564819968'
);
});
it('negative middle value', function() {
testInt256Decode(
'0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffff8a432eb',
'-123456789'
);
});
it('middle value', function() {
testInt256Decode(
'0x00000000000000000000000000000000000000000000000000000000075bcd15',
'123456789'
);
});
it('max value', function() {
testInt256Decode(
'0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
'57896044618658097711785492504343953926634992332820282019728792003956564819967'
);
});
});
});
});
16 changes: 9 additions & 7 deletions tests/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var fs = require('fs');
var path = require('path');
var zlib = require('zlib');

var abiCoder = require('../utils/abi-coder');
var bigNumber = require('../utils/bignumber');
var convert = require('../utils/convert');
var keccak256 = require('../utils/keccak256');
Expand Down Expand Up @@ -85,23 +86,24 @@ function equals(a, b) {
}

function saveTests(tag, data) {
var filename = path.resolve(__dirname, 'tests', tag + '.json.gz');
var filename = path.resolve(__dirname, 'tests', tag + '.json.gz');

var data = JSON.stringify(data, undefined, ' ') + '\n';
fs.writeFileSync(filename, zlib.gzipSync(data));
var data = JSON.stringify(data, undefined, ' ') + '\n';
fs.writeFileSync(filename, zlib.gzipSync(data));

console.log('Save testcase: ' + filename);
console.log('Save testcase: ' + filename);
}

function loadTests(tag) {
var filename = path.resolve(__dirname, 'tests', tag + '.json.gz');
return JSON.parse(zlib.gunzipSync(fs.readFileSync(filename)));
var filename = path.resolve(__dirname, 'tests', tag + '.json.gz');
return JSON.parse(zlib.gunzipSync(fs.readFileSync(filename)));
}

module.exports = {
abiCoder: abiCoder,
randomBytes: randomBytes,
randomHexString: randomHexString,
randomNumber:randomNumber,
randomNumber: randomNumber,

bigNumberify: bigNumber.bigNumberify,

Expand Down
53 changes: 53 additions & 0 deletions utils/abi-coder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,54 @@ var coderNull = function(coerceFunc) {
};
}


function checkIntBounds(localName, size, value) {
var min = utils
.bigNumberify(2)
.pow(size * 8 - 1)
.mul(-1);
var max = utils
.bigNumberify(2)
.pow(size * 8 - 1)
.sub(1);
checkNumberBounds(localName, value, min, max);
}

function checkUintBounds(localName, size, value) {
var min = 0;
var max = utils
.bigNumberify(2)
.pow(size * 8)
.sub(1);
checkNumberBounds(localName, value, min, max);
}

function checkNumberBounds(localName, value, min, max) {
if (value.lt(min)) {
errors.throwError(
'invalid number value (overflow)',
errors.INVALID_ARGUMENT,
{
arg: localName,
type: typeof value,
value: value
}
);
}
if (value.gt(max)) {
errors.throwError(
'invalid number value (overflow)',
errors.INVALID_ARGUMENT,
{
arg: localName,
type: typeof value,
value: value
}
);
}
}


var coderNumber = function(coerceFunc, size, signed, localName) {
var name = ((signed ? 'int': 'uint') + (size * 8));
return {
Expand All @@ -340,6 +388,11 @@ var coderNumber = function(coerceFunc, size, signed, localName) {
value: value
});
}
if (signed) {
checkIntBounds(localName, size, value);
} else {
checkUintBounds(localName, size, value);
}
value = value.toTwos(size * 8).maskn(size * 8);
//value = value.toTwos(size * 8).maskn(size * 8);
if (signed) {
Expand Down