More robust error handling

luben · Nov 30, 2023 · 475ed5d · 475ed5d
1 parent 96be04a
commit 475ed5d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/main/java/com/github/luben/zstd/Zstd.java b/src/main/java/com/github/luben/zstd/Zstd.java
@@ -591,7 +591,7 @@ public static long decompressDirectByteBufferFastDict(ByteBuffer dst, int dstOff
     public static native int loadDictCompress(long stream, byte[] dict, int dict_size);
     public static native int loadFastDictCompress(long stream, ZstdDictCompress dict);
     public static native void registerSequenceProducer(long stream, long seqProdState, long seqProdFunction);
-    public static native void generateSequences(long stream, long outSeqs, long outSeqsSize, long src, long srcSize);
+    static native void generateSequences(long stream, long outSeqs, long outSeqsSize, long src, long srcSize);
     static native long getBuiltinSequenceProducer(); // Used in tests
     static native long getStubSequenceProducer();    // Used in tests
     public static native int setCompressionChecksums(long stream, boolean useChecksums);

diff --git a/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java b/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java
@@ -283,19 +283,27 @@ public ZstdCompressCtx setLong(int windowLog) {
     public ZstdCompressCtx registerSequenceProducer(SequenceProducer producer) {
         ensureOpen();
         acquireSharedLock();
-        if (this.seqprod != null) {
-            this.seqprod.freeState(seqprod_state);
-        }
+        try {
+            if (this.seqprod != null) {
+                this.seqprod.freeState(seqprod_state);
+                this.seqprod = null;
+            }
 
-        if (producer == null) {
-            seqprod_state = 0;
+            if (producer == null) {
+                Zstd.registerSequenceProducer(nativePtr, 0, 0);
+            } else {
+                seqprod_state = producer.createState();
+                Zstd.registerSequenceProducer(nativePtr, seqprod_state, producer.getFunctionPointer());
+                this.seqprod = producer;
+            }
+        } catch (Exception e) {
+            this.seqprod = null;
             Zstd.registerSequenceProducer(nativePtr, 0, 0);
-        } else {
-            seqprod_state = producer.createState();
-            Zstd.registerSequenceProducer(nativePtr, seqprod_state, producer.getFunctionPointer());
+            releaseSharedLock();
+            throw e;
+        } finally {
+            releaseSharedLock();
         }
-        this.seqprod = producer;
-        releaseSharedLock();
         return this;
     }