projects
/
ldk-java
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Treat pointers up to 4096 as null, matching our test values in ldk-c-bindings
[ldk-java]
/
typescript_strings.py
diff --git
a/typescript_strings.py
b/typescript_strings.py
index c097921f7d43de5ebc733be09392e1b24e19a6e4..54159d8d85099d3c0db71e0710dd7194d5618c2f 100644
(file)
--- a/
typescript_strings.py
+++ b/
typescript_strings.py
@@
-120,9
+120,10
@@
void *malloc(size_t size);
void free(void *ptr);
#define MALLOC(a, _) malloc(a)
void free(void *ptr);
#define MALLOC(a, _) malloc(a)
-#define FREE(p) if ((
long)(p) > 1024
) { free(p); }
+#define FREE(p) if ((
unsigned long)(p) > 4096
) { free(p); }
#define DO_ASSERT(a) (void)(a)
#define CHECK(a)
#define DO_ASSERT(a) (void)(a)
#define CHECK(a)
+#define CHECK_ACCESS(p)
"""
else:
self.c_file_pfx = self.c_file_pfx + """
"""
else:
self.c_file_pfx = self.c_file_pfx + """
@@
-174,11
+175,21
@@
static void alloc_freed(void* ptr) {
__real_free(it);
}
static void FREE(void* ptr) {
__real_free(it);
}
static void FREE(void* ptr) {
- if ((
long)ptr < 1024
) return; // Rust loves to create pointers to the NULL page for dummys
+ if ((
unsigned long)ptr <= 4096
) return; // Rust loves to create pointers to the NULL page for dummys
alloc_freed(ptr);
__real_free(ptr);
}
alloc_freed(ptr);
__real_free(ptr);
}
+static void CHECK_ACCESS(void* ptr) {
+ allocation* it = allocation_ll;
+ while (it->ptr != ptr) {
+ it = it->next;
+ if (it == NULL) {
+ return; // addrsan should catch malloc-unknown and print more info than we have
+ }
+ }
+}
+
void* __wrap_malloc(size_t len) {
void* res = __real_malloc(len);
new_allocation(res, "malloc call");
void* __wrap_malloc(size_t len) {
void* res = __real_malloc(len);
new_allocation(res, "malloc call");