portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meson: Fix include_directories sandbox violation (#6119)

Browse source
This commit is contained in:
Khairul Azhar Kasmiran 2026-03-29 17:44:45 +08:00 committed by GitHub
parent c6d566a44a
commit e0ec191f97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
librz/include/rz_core.h
View file

@ -32,7 +32,6 @@
#include <rz_crypto.h>
#include <rz_bind.h>
#include <rz_util/rz_annotated_code.h>
#include <rz_heap_glibc.h>
#include <rz_windows_heap.h>
#include <rz_mark.h>
@ -1005,16 +1004,6 @@ RZ_API void rz_core_sysenv_end(RzCore *core);
RZ_API void rz_core_recover_vars(RzCore *core, RzAnalysisFunction *fcn, bool argonly);
/* heap_glibc.c */
RZ_API RzList /*<RzHeapChunkListItem *>*/ *rz_heap_chunks_list(RzCore *core, ut64 m_arena);
RZ_API RzList /*<RzArenaListItem *>*/ *rz_heap_arenas_list(RzCore *core);
RZ_API RzHeapChunkSimple *rz_heap_chunk(RzCore *core, ut64 addr);
RZ_API RzHeapBin *rz_heap_bin_content(RzCore *core, MallocState *arena, int bin_num, ut64 m_arena);
RZ_API RzHeapBin *rz_heap_fastbin_content(RzCore *core, MallocState *arena, int bin_num);
RZ_API MallocState *rz_heap_get_arena(RzCore *core, ut64 m_state);
RZ_API RzList /*<RzHeapBin *>*/ *rz_heap_tcache_content(RzCore *core, ut64 arena_base);
RZ_API bool rz_heap_write_chunk(RzCore *core, RzHeapChunkSimple *chunk_simple);
/* cmd_windows_heap.c */
RZ_API RZ_OWN RzList /*<RzWindowsHeapBlock *>*/ *rz_heap_windows_blocks_list(RzCore *core);
RZ_API RZ_OWN RzList /*<RzWindowsHeapInfo *>*/ *rz_heap_windows_heap_list(RzCore *core);

5
librz/include/rz_heap_glibc.h
View file

@ -35,6 +35,7 @@ RZ_LIB_VERSION_HEADER(rz_heap_glibc);
RZ_API RzHeapChunkSimple *rz_heap_chunk(RzCore *core, ut64 addr);
RZ_API RzHeapChunk *rz_heap_get_chunk_at_addr(RzCore *core, ut64 addr);
RZ_API RzList /*<RzHeapChunkListItem *>*/ *rz_heap_chunks_list(RzCore *core, ut64 m_arena);
RZ_API RzList /*<RzArenaListItem *>*/ *rz_heap_arenas_list(RzCore *core);
RZ_API bool rz_heap_resolve_main_arena(RzCore *core, ut64 *m_arena);
RZ_API double rz_get_glibc_version(RzCore *core, const char *libc_path, ut8 *banner);
@ -44,10 +45,6 @@ RZ_API RzList /*<RzHeapBin *>*/ *rz_heap_tcache_content(RzCore *core, ut64 arena
RZ_API MallocState *rz_heap_get_arena(RzCore *core, ut64 m_state);
RZ_API RzHeapBin *rz_heap_fastbin_content(RzCore *core, MallocState *main_arena, int bin_num);
RZ_API RzHeapBin *rz_heap_bin_content(RzCore *core, MallocState *main_arena, int bin_num, ut64 m_arena);
RZ_API RzList /*<RzHeapChunkListItem *>*/ *rz_heap_chunks(RzCore *core, ut64 m_state);
RZ_API RzList /*<RzArenaListItem *>*/ *rz_heap_arena_list(RzCore *core);
RZ_IPI RzCmdStatus rz_cmd_heap_fastbins_print_handler(RzCore *core, int argc, const char **argv);
RZ_IPI RzCmdStatus rz_cmd_heap_bins_list_print_handler(RzCore *core, int argc, const char **argv, RzOutputMode mode);
RZ_API void rz_heap_bin_free(RzHeapBin *bin);
#ifdef __cplusplus

2
meson.build
View file

@ -44,7 +44,7 @@ cc = meson.get_compiler('c')
cc_native = meson.get_compiler('c', native: true)
platform_deps = []
platform_inc = ['.', 'librz', 'librz/include', 'subprojects/rzheap']
platform_inc = ['.', 'librz', 'librz/include']
if host_machine.system() == 'windows'
add_project_arguments('-DPSAPI_VERSION=1', language: 'c')
platform_deps = [

1
test/integration/meson.build
View file

@ -60,6 +60,7 @@ if get_option('enable_tests') and cli_enabled
rz_hash_dep,
rz_crypto_dep,
rz_magic_dep,
rzheap_dep,
lrt,
],
install: false,