js/binary/utils.js: Fix jspb.utils.joinUnsignedDecimalString to work with negative bitsLow and low but non-zero bitsHigh parameter. (#8170)

pull/8195/head
Aaron Son 4 years ago committed by GitHub
parent 7089ff0ef2
commit 10599e6c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      js/binary/decoder_test.js
  2. 2
      js/binary/utils.js

@ -315,6 +315,9 @@ describe('binaryDecoderTest', function() {
// 64-bit extremes, not in dev guide.
{original: '9223372036854775807', zigzag: '18446744073709551614'},
{original: '-9223372036854775808', zigzag: '18446744073709551615'},
// None of the above catch: bitsLow < 0 && bitsHigh > 0 && bitsHigh < 0x1FFFFF.
// The following used to be broken.
{original: '72000000000', zigzag: '144000000000'},
];
var encoder = new jspb.BinaryEncoder();
testCases.forEach(function(c) {

@ -511,7 +511,7 @@ jspb.utils.joinUnsignedDecimalString = function(bitsLow, bitsHigh) {
// Skip the expensive conversion if the number is small enough to use the
// built-in conversions.
if (bitsHigh <= 0x1FFFFF) {
return '' + (jspb.BinaryConstants.TWO_TO_32 * bitsHigh + bitsLow);
return '' + jspb.utils.joinUint64(bitsLow, bitsHigh);
}
// What this code is doing is essentially converting the input number from

Loading…
Cancel
Save