Merge pull request #113 from TheBlueMatt/main

[ldk-java] / ts / structs / CommonBase.mts

diff --git a/ts/structs/CommonBase.mts b/ts/structs/CommonBase.mts
index a7586b038f849eb3c6a2030b9fe0f4e12c1d009d..75630f913c2b09a5449767fbae2ccd8c745af4e2 100644 (file)
--- a/ts/structs/CommonBase.mts
+++ b/ts/structs/CommonBase.mts
@@ -367,7 +367,7 @@ export class CommonBase {
        protected constructor(ptr: number, free_fn: (ptr: number) => void) {
                this.ptr = ptr;
                if (Number.isFinite(ptr) && ptr != 0){
-                       finalizer.register(this, get_freeer(ptr, free_fn));
+                       finalizer.register(this, get_freeer(ptr, free_fn), this);
                }
        }
        // In Java, protected means "any subclass can access fields on any other subclass'"
@@ -381,7 +381,10 @@ export class CommonBase {
        }
        protected static set_null_skip_free(o: CommonBase) {
                o.ptr = 0;
-               finalizer.unregister(o);
+               // @ts-ignore TypeScript is wrong about the returnvalue of unregister here!
+               const did_unregister: boolean = finalizer.unregister(o);
+               if (!did_unregister)
+                       throw new Error("FinalizationRegistry unregister should always unregister unless you double-free'd");
        }
 }