Correctly handle top-bit-set pointers, fixing Android 11

[ldk-java] / java_strings.py

diff --git a/java_strings.py b/java_strings.py
index d2054a172237019f84284beceab2b31834dca60e..1e7ba997083b055cbe04113be14ddb0851b6d90d 100644 (file)
--- a/java_strings.py
+++ b/java_strings.py
@@ -115,7 +115,7 @@ import java.util.LinkedList;
 class CommonBase {
        long ptr;
        LinkedList<Object> ptrs_to = new LinkedList();
-       protected CommonBase(long ptr) { assert ptr > 1024; this.ptr = ptr; }
+       protected CommonBase(long ptr) { assert ptr < 0 || ptr > 1024; this.ptr = ptr; }
 }
 """
 
@@ -1258,7 +1258,7 @@ import javax.annotation.Nullable;
                     out_java_struct += (info.arg_name)
             out_java_struct += (");\n")
             if return_type_info.java_ty == "long" and return_type_info.java_hu_ty != "long":
-                out_java_struct += "\t\tif (ret < 1024) { return null; }\n"
+                out_java_struct += "\t\tif (ret >= 0 && ret < 1024) { return null; }\n"
 
             if return_type_info.to_hu_conv is not None:
                 if not takes_self: