From 7ff42b590f07497364d84e80f68d99e0725f1400 Mon Sep 17 00:00:00 2001 From: pancake Date: Tue, 14 Jun 2016 02:52:52 +0200 Subject: [PATCH] Fix build and bring back java memleak to avoid crash --- libr/io/p/io_procpid.c | 2 +- shlr/java/class.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libr/io/p/io_procpid.c b/libr/io/p/io_procpid.c index 1ef5d96d72..092e3b7922 100644 --- a/libr/io/p/io_procpid.c +++ b/libr/io/p/io_procpid.c @@ -82,7 +82,7 @@ static RIODesc *__open(struct r_io_t *io, const char *file, int rw, int mode) { } fd = ret; //TODO: use r_io_fd api snprintf (procpidpath, sizeof (procpidpath), "/proc/%d/mem", pid); - fd = r_sandbox_open (procpidpath, O_RDWR); + fd = r_sandbox_open (procpidpath, O_RDWR, 0); if (fd != -1) { RIOProcpid *riop = R_NEW0 (RIOProcpid); if (!riop) { diff --git a/shlr/java/class.c b/shlr/java/class.c index d1119a678c..c5c4fcf2cb 100644 --- a/shlr/java/class.c +++ b/shlr/java/class.c @@ -2945,8 +2945,8 @@ R_API void r_bin_java_attribute_free (void/*RBinJavaAttrInfo*/* a) { if (attr) { IFDBG eprintf ("Deleting attr %s, %p\n", attr->name, attr); ((RBinJavaAttrMetas *) attr->metas->type_info)->allocs->delete_obj (attr); - free (attr->metas); - free (attr); + //free (attr->metas); + //free (attr); } } @@ -3796,7 +3796,7 @@ R_API RBinJavaAttrInfo* r_bin_java_source_code_file_attr_new (ut8 *buffer, ut64 RBinJavaAttrInfo* attr = r_bin_java_default_attr_new (buffer, sz, buf_offset); offset += 6; if (!attr || !sz) { - r_bin_java_attribute_free (attr); + //free (attr); //r_bin_java_attribute_free (attr); return NULL; } attr->type = R_BIN_JAVA_ATTR_TYPE_SOURCE_FILE_ATTR;