Merge pull request #628 from opl-/fix/reset-readers-before-reuse

Fix readers not reset by Browser*Readers, causing invalid results
zxing-js · Dec 1, 2024 · 70cd2fa · 70cd2fa
2 parents fac984c + 9590cd4
commit 70cd2fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/browser/BrowserCodeReader.ts b/src/browser/BrowserCodeReader.ts
@@ -1046,7 +1046,12 @@ export class BrowserCodeReader {
    * Call the encapsulated readers decode
    */
   public decodeBitmap(binaryBitmap: BinaryBitmap): Result {
-    return this.reader.decode(binaryBitmap, this._hints);
+    try {
+      return this.reader.decode(binaryBitmap, this._hints);
+    } finally {
+      // Readers need to be reset before being reused on another bitmap.
+      this.reader.reset();
+    }
   }
 
   /**

diff --git a/src/browser/BrowserMultiFormatReader.ts b/src/browser/BrowserMultiFormatReader.ts
@@ -29,6 +29,11 @@ export class BrowserMultiFormatReader extends BrowserCodeReader {
    * attention to the hints set in the constructor function
    */
   public decodeBitmap(binaryBitmap: BinaryBitmap): Result {
-    return this.reader.decodeWithState(binaryBitmap);
+    try {
+      return this.reader.decodeWithState(binaryBitmap);
+    } finally {
+      // Readers need to be reset before being reused on another bitmap.
+      this.reader.reset();
+    }
   }
 }