From 78ff1e69b6affbf04bf61955a52d8752202777a8 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Thu, 3 Sep 2015 00:40:39 +0200 Subject: [PATCH] libmagic: fail on all state transfer errors Also do not report debugging information by default. Change-Id: I5d80a3df3c3ecc16a577d88abe6e37a792add747 --- minix/llvm/include/st/callback.h | 2 +- minix/llvm/static/magic/magic_st.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minix/llvm/include/st/callback.h b/minix/llvm/include/st/callback.h index 9287508cc..42cc6fabb 100644 --- a/minix/llvm/include/st/callback.h +++ b/minix/llvm/include/st/callback.h @@ -114,7 +114,7 @@ PUBLIC void st_cb_map_selement_generic(_magic_selement_t *cached_selement, _magi #define ST_CB_PRINT_DBG 0x02 #define ST_CB_PRINT_ERR 0x04 #define ST_CB_FORCE_IXFER 0x08 -#define ST_CB_DEFAULT_FLAGS (ST_CB_PRINT_DBG|ST_CB_PRINT_ERR) +#define ST_CB_DEFAULT_FLAGS (ST_CB_PRINT_ERR) #define ST_CB_FLAG(F) (cb_info->st_cb_flags & F) #define ST_CB_DBG ST_CB_PRINT_DBG diff --git a/minix/llvm/static/magic/magic_st.c b/minix/llvm/static/magic/magic_st.c index 1af9f00b7..82ca42492 100644 --- a/minix/llvm/static/magic/magic_st.c +++ b/minix/llvm/static/magic/magic_st.c @@ -18,7 +18,7 @@ EXTERN endpoint_t sef_self_endpoint; #define DO_SKIP_UNPAIRED_PTR_TARGETS 1 #endif -#define DO_SKIP_INVARIANTS_VIOLATIONS 1 +#define DO_SKIP_INVARIANTS_VIOLATIONS 0 PRIVATE st_alloc_pages *st_alloc_pages_current = NULL; PRIVATE int st_alloc_buff_available = 0;