Minor merge fix

NeRdTheNed · Nov 12, 2023 · fe818cd · fe818cd
1 parent 65be1b8
commit fe818cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/deft4j-base/src/main/java/com/github/NeRdTheNed/deft4j/deflate/DeflateBlockHuffman.java b/deft4j-base/src/main/java/com/github/NeRdTheNed/deft4j/deflate/DeflateBlockHuffman.java
@@ -1263,6 +1263,7 @@ public DeflateBlock merge(DeflateBlock append) {
             merged.litlenSizeBits += otherFixed.litlenSizeBits;
             merged.litlenSizeBits -= getLitLenSize(eob, merged.litlenDec, merged.distDec);
             merged.sizeBits += merged.litlenSizeBits;
+            merged.setNext(append.getNext());
             return merged;
         }
 

diff --git a/deft4j-base/src/main/java/com/github/NeRdTheNed/deft4j/deflate/DeflateStream.java b/deft4j-base/src/main/java/com/github/NeRdTheNed/deft4j/deflate/DeflateStream.java
@@ -601,7 +601,13 @@ public long mergeBlocks() {
 
                         currentBlock.replace(merged);
                         currentBlock.discard();
-                        merged.setNext(nextBlock.getNext());
+                        final DeflateBlock next = nextBlock.getNext();
+                        merged.setNext(next);
+
+                        if (next != null) {
+                            next.setPrevious(merged);
+                        }
+
                         currentBlock = merged;
 
                         if (first) {