Handle 0-length byte buffers in micro and nano protobufs

Change-Id: I845ee1ab1005d25c8d77a8c2ed801c0f7b7c847b

Handle 0-length byte buffers in micro and nano protobufs
Change-Id: I845ee1ab1005d25c8d77a8c2ed801c0f7b7c847b
15bff99d · Andre Eisenbach · Brian Duff · 16a283f7 · 15bff99d
Commit 15bff99d authored May 04, 2015 by Andre Eisenbach Committed by Brian Duff May 05, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CodedInputByteBufferNano.java ...va/com/google/protobuf/nano/CodedInputByteBufferNano.java +2 -0

No files found.
--- a/javanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
+++ b/javanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
@@ -236,6 +236,8 @@ public final class CodedInputByteBufferNano {
      System.arraycopy(buffer, bufferPos, result, 0, size);
      bufferPos += size;
      return result;
+    } else if (size == 0) {
+      return WireFormatNano.EMPTY_BYTES;
    } else {
      // Slow path:  Build a byte array first then copy it.
      return readRawBytes(size);