grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix utf8 decoding (#5533)

Browse Source 
* Fixes #5492

* Linting
This commit is contained in:
Nicolas Gotchac 2017-05-02 17:52:49 +02:00 committed by Jaco Greeff
parent b0e4c913c0
commit a56b2f5993
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/abi/decoder/decoder.js
View File

@ -113,7 +113,15 @@ export default class Decoder {
const str = taken.bytes.map((code) => String.fromCharCode(code)).join(''); const str = taken.bytes.map((code) => String.fromCharCode(code)).join('');
return new DecodeResult(new Token(param.type, utf8.decode(str)), offset + 1); let decoded;
try {
decoded = utf8.decode(str);
} catch (error) {
decoded = str;
}
return new DecodeResult(new Token(param.type, decoded), offset + 1);
case 'array': case 'array':
lengthOffset = asU32(Decoder.peek(slices, offset)).div(32).toNumber(); lengthOffset = asU32(Decoder.peek(slices, offset)).div(32).toNumber();

8
js/src/abi/decoder/decoder.spec.js
View File

@ -38,6 +38,7 @@ describe('abi/decoder/Decoder', () => {
const int1 = '0111111111111111111111111111111111111111111111111111111111111111'; const int1 = '0111111111111111111111111111111111111111111111111111111111111111';
const intn = 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff85'; const intn = 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff85';
const string1 = '6761766f66796f726b0000000000000000000000000000000000000000000000'; const string1 = '6761766f66796f726b0000000000000000000000000000000000000000000000';
const string2 = '4665726ee16e64657a0000000000000000000000000000000000000000000000';
const tokenAddress1 = new Token('address', `0x${address1.slice(-40)}`); const tokenAddress1 = new Token('address', `0x${address1.slice(-40)}`);
const tokenAddress2 = new Token('address', `0x${address2.slice(-40)}`); const tokenAddress2 = new Token('address', `0x${address2.slice(-40)}`);
const tokenAddress3 = new Token('address', `0x${address3.slice(-40)}`); const tokenAddress3 = new Token('address', `0x${address3.slice(-40)}`);
@ -53,6 +54,7 @@ describe('abi/decoder/Decoder', () => {
const tokenUint1 = new Token('uint', new BigNumber(int1, 16)); const tokenUint1 = new Token('uint', new BigNumber(int1, 16));
const tokenUintn = new Token('uint', new BigNumber(intn, 16)); const tokenUintn = new Token('uint', new BigNumber(intn, 16));
const tokenString1 = new Token('string', 'gavofyork'); const tokenString1 = new Token('string', 'gavofyork');
const tokenString2 = new Token('string', 'Fernández');
const slices = [ address1, address2, address3, address4 ]; const slices = [ address1, address2, address3, address4 ];
describe('peek', () => { describe('peek', () => {
@ -160,6 +162,12 @@ describe('abi/decoder/Decoder', () => {
).to.deep.equal(tokenString1); ).to.deep.equal(tokenString1);
}); });
it('decodes utf8-invalid string', () => {
expect(
Decoder.decodeParam(new ParamType('string'), [padU32(0x20), padU32(9), string2], 0).token
).to.deep.equal(tokenString2);
});
it('decodes string (indexed)', () => { it('decodes string (indexed)', () => {
expect( expect(
Decoder.decodeParam(new ParamType('string', null, 0, true), [bytes1], 0) Decoder.decodeParam(new ParamType('string', null, 0, true), [bytes1], 0)