mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 01:57:43 +00:00
Code Issues Releases Wiki Activity

parser: fix coverity's "not restoring ostream format"

Browse Source 
Save the ostream flags and restore them after the std::hex
modification.

Signed-off-by: Georgia Garcia <georgia.garcia@canonical.com>
This commit is contained in:
Georgia Garcia 2025-08-04 18:49:24 -03:00
parent 05458768cf
commit 3faddfcf46
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
parser/mount.cc
View File

@ -570,6 +570,8 @@ ostream &mnt_rule::dump(ostream &os)
{ {
prefix_rule_t::dump(os); prefix_rule_t::dump(os);
std::ios::fmtflags fmt(os.flags());
if (perms & AA_MAY_MOUNT) if (perms & AA_MAY_MOUNT)
os << "mount"; os << "mount";
else if (perms & AA_MAY_UMOUNT) else if (perms & AA_MAY_UMOUNT)
@ -603,6 +605,7 @@ ostream &mnt_rule::dump(ostream &os)
os << " " << "(0x" << hex << perms << "/0x" << (audit != AUDIT_UNSPECIFIED ? perms : 0) << ")"; os << " " << "(0x" << hex << perms << "/0x" << (audit != AUDIT_UNSPECIFIED ? perms : 0) << ")";
os << ",\n"; os << ",\n";
os.flags(fmt);
return os; return os;
} }

7
parser/rule.h
View File

@ -431,11 +431,14 @@ public:
ostream &dump(ostream &os) override { ostream &dump(ostream &os) override {
class_rule_t::dump(os); class_rule_t::dump(os);
std::ios::fmtflags fmt(os.flags());
if (saved) if (saved)
os << "(0x" << std::hex << perms << "/orig " << saved << ") "; os << "(0x" << std::hex << perms << "/orig " << saved << ") ";
else else
os << "(0x" << std::hex << perms << ") "; os << "(0x" << std::hex << perms << ") ";
os.flags(fmt);
return os; return os;
} }
@ -460,7 +463,11 @@ public:
ostream &dump(ostream &os) override { ostream &dump(ostream &os) override {
class_rule_t::dump(os); class_rule_t::dump(os);
std::ios::fmtflags fmt(os.flags());
os << "(0x" << std::hex << perms << ") "; os << "(0x" << std::hex << perms << ") ";
os.flags(fmt);
return os; return os;
} }