Merge pull request #11301 from Snuffleupagus/peekByte-eof

Ensure that the `peekByte` methods, on the various Streams, handles end of data correctly (PR 5286 follow-up)
mozilla · Nov 1, 2019 · 0eda75c · 0eda75c
2 parents 30ef05c + 829d6ba
commit 0eda75c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/core/chunked_stream.js b/src/core/chunked_stream.js
@@ -213,7 +213,9 @@ class ChunkedStream {
 
   peekByte() {
     const peekedByte = this.getByte();
-    this.pos--;
+    if (peekedByte !== -1) {
+      this.pos--;
+    }
     return peekedByte;
   }
 

diff --git a/src/core/stream.js b/src/core/stream.js
@@ -86,7 +86,9 @@ var Stream = (function StreamClosure() {
     },
     peekByte: function Stream_peekByte() {
       var peekedByte = this.getByte();
-      this.pos--;
+      if (peekedByte !== -1) {
+        this.pos--;
+      }
       return peekedByte;
     },
     peekBytes(length, forceClamped = false) {
@@ -234,7 +236,9 @@ var DecodeStream = (function DecodeStreamClosure() {
     },
     peekByte: function DecodeStream_peekByte() {
       var peekedByte = this.getByte();
-      this.pos--;
+      if (peekedByte !== -1) {
+        this.pos--;
+      }
       return peekedByte;
     },
     peekBytes(length, forceClamped = false) {