From a31343c5f797fe753c4ab1879e078a6a1d170503 Mon Sep 17 00:00:00 2001 From: John Johansen Date: Mon, 11 Nov 2024 14:39:40 -0800 Subject: [PATCH] parser: fix expr MatchFlag dump Match Flags convert output to hex but don't restore after outputting the flag resulting in following numbers being hex encoded. This results in dumps that can be confusing eg. rule: \d2 -> \x2 priority=1001 (0x4/0)< 0x4> rule: \d7 -> \a priority=3e9 (0x4/0)< 0x4> rule: \d10 -> \n priority=3e9 (0x4/0)< 0x4> rule: \d9 -> \t priority=3e9 (0x4/0)< 0x4> rule: \d14 -> \xe priority=1001 (0x4/0)< 0x4> where priority=3e9 is the hex encoded priority 1001. Signed-off-by: John Johansen --- parser/libapparmor_re/expr-tree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/libapparmor_re/expr-tree.h b/parser/libapparmor_re/expr-tree.h index 4befb294b..b59ea8ebf 100644 --- a/parser/libapparmor_re/expr-tree.h +++ b/parser/libapparmor_re/expr-tree.h @@ -890,7 +890,7 @@ public: { type_flags |= NODE_TYPE_MATCHFLAG; } - ostream &dump(ostream &os) { return os << "< 0x" << hex << perms << '>'; } + ostream &dump(ostream &os) { return os << "< 0x" << hex << perms << std::dec << '>'; } int priority; perm32_t perms;