Fixed serialization order of sfixed64, fixes #536

protobufjs · Dec 10, 2016 · 66be598 · 66be598
1 parent 67449db
commit 66be598
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 7 deletions.
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/src/writer.js b/src/writer.js
@@ -324,7 +324,7 @@ WriterPrototype.fixed64 = function write_fixed64(value) {
  */
 WriterPrototype.sfixed64 = function write_sfixed64(value) {
     var bits = LongBits.from(value).zzEncode();
-    return this.push(writeFixed32, 4, bits.hi).push(writeFixed32, 4, bits.lo);
+    return this.push(writeFixed32, 4, bits.lo).push(writeFixed32, 4, bits.hi);
 };
 
 var writeFloat = typeof Float32Array !== 'undefined'

diff --git a/tests/sfixed64-grpc.js b/tests/sfixed64-grpc.js
@@ -0,0 +1,38 @@
+var tape = require("tape");
+
+var protobuf = require("..");
+
+tape.test("sfixed64 for grpc", function(test) {
+
+    var root = protobuf.Root.fromJSON({
+        nested: {
+            test: {
+                nested: {
+                    Test: {
+                        fields: {
+                            int_64: {
+                                type: 'sfixed64',
+                                id: 1
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    var Test = root.lookup("test.Test");
+
+    var buffer = Test.encode({
+        int_64: '-9095674951825889465'
+    }).finish();
+
+    test.equal(buffer.length, 9, "should encode a total of 9 bytes");
+    test.equal(buffer[0], 9, "should encode id 1, wireType 1");
+
+    var decoded = Test.decode(buffer);
+    test.ok(decoded.int_64 == '-9095674951825889465', "should decode back the original value");
+
+    test.end();
+
+});