Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
99cf2efa
Commit
99cf2efa
authored
May 05, 2017
by
Adam Cozzette
Committed by
GitHub
May 05, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3056 from acozzette/cherry-pick-pr-2873
Cherry-pick the fix from pull request #2873
parents
dd0a2332
22c8772e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
decoder.js
js/binary/decoder.js
+1
-1
utils.js
js/binary/utils.js
+1
-1
utils_test.js
js/binary/utils_test.js
+12
-12
No files found.
js/binary/decoder.js
View file @
99cf2efa
...
...
@@ -994,7 +994,7 @@ jspb.BinaryDecoder.prototype.readString = function(length) {
codeUnits
.
length
=
0
;
}
}
result
+=
String
.
fromCharCode
.
apply
(
null
,
codeUnits
);
result
+=
goog
.
crypt
.
byteArrayToString
(
codeUnits
);
this
.
cursor_
=
cursor
;
return
result
;
};
...
...
js/binary/utils.js
View file @
99cf2efa
...
...
@@ -613,7 +613,7 @@ jspb.utils.decimalStringToHash64 = function(dec) {
muladd
(
1
,
1
);
}
return
String
.
fromCharCode
.
apply
(
null
,
resultBytes
);
return
goog
.
crypt
.
byteArrayToString
(
resultBytes
);
};
...
...
js/binary/utils_test.js
View file @
99cf2efa
...
...
@@ -205,31 +205,31 @@ describe('binaryUtilsTest', function() {
var
convert
=
jspb
.
utils
.
decimalStringToHash64
;
result
=
convert
(
'0'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
]),
result
);
result
=
convert
(
'-1'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
]),
result
);
result
=
convert
(
'18446744073709551615'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
]),
result
);
result
=
convert
(
'9223372036854775808'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x80
]),
result
);
result
=
convert
(
'-9223372036854775808'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x80
]),
result
);
result
=
convert
(
'123456789123456789'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0x15
,
0x5F
,
0xD0
,
0xAC
,
0x4B
,
0x9B
,
0xB6
,
0x01
]),
result
);
result
=
convert
(
'-123456789123456789'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0xEB
,
0xA0
,
0x2F
,
0x53
,
0xB4
,
0x64
,
0x49
,
0xFE
]),
result
);
});
...
...
@@ -259,21 +259,21 @@ describe('binaryUtilsTest', function() {
var
convert
=
jspb
.
utils
.
hexStringToHash64
;
result
=
convert
(
'0x0000000000000000'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
]),
result
);
result
=
convert
(
'0xffffffffffffffff'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
]),
result
);
// Hex string is big-endian, hash string is little-endian.
result
=
convert
(
'0x123456789ABCDEF0'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0xF0
,
0xDE
,
0xBC
,
0x9A
,
0x78
,
0x56
,
0x34
,
0x12
]),
result
);
// Capitalization should not matter.
result
=
convert
(
'0x0000abcdefABCDEF'
);
assertEquals
(
String
.
fromCharCode
.
apply
(
null
,
assertEquals
(
goog
.
crypt
.
byteArrayToString
(
[
0xEF
,
0xCD
,
0xAB
,
0xEF
,
0xCD
,
0xAB
,
0x00
,
0x00
]),
result
);
});
...
...
@@ -643,7 +643,7 @@ describe('binaryUtilsTest', function() {
var
sourceBytes
=
new
Uint8Array
(
sourceData
);
var
sourceBuffer
=
sourceBytes
.
buffer
;
var
sourceBase64
=
goog
.
crypt
.
base64
.
encodeByteArray
(
sourceData
);
var
sourceString
=
String
.
fromCharCode
.
apply
(
null
,
sourceData
);
var
sourceString
=
goog
.
crypt
.
byteArrayToString
(
sourceData
);
function
check
(
result
)
{
assertEquals
(
Uint8Array
,
result
.
constructor
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment