Merge pull request #451 from candrews/patch-1

Fix get incorrectly handling null bytes
koush · May 24, 2016 · 49268eb · 49268eb
2 parents 8120535 + 0125546
commit 49268eb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -162,8 +162,12 @@ public void get(byte[] bytes, int offset, int length) {
         while (need > 0) {
             ByteBuffer b = mBuffers.peek();
             int read = Math.min(b.remaining(), need);
-            if (bytes != null)
+            if (bytes != null){
                 b.get(bytes, offset, read);
+            } else {
+                //when bytes is null, just skip data.
+                b.position(b.position() + read);
+            }
             need -= read;
             offset += read;
             if (b.remaining() == 0) {