i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strace: Fix handling of statMask when building stat string

Browse Source 
Fix a crash caused by decoding stat arguments when the statMask is
only B_STAT_MODE or all 0.

Change-Id: Ic57c5494fbf4d20605955d3cc4c21f96e380fab1
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10283
Reviewed-by: waddlesplash <[email protected]>
Haiku-Format: Haiku-format Bot <[email protected]>
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Nathan Patrizi
2026-01-28 11:42:30 +00:00
committed by Jérôme Duval
parent 44cdc0420b
commit d3f0a24569
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/debug/strace/file.cpp
+9 -2
View File
@@ -64,15 +64,18 @@ read_stat(Context &context, Parameter *param, void *data)
string r; string r;
if ((statMask & 0xffffffff) == 0xffffffff) { if ((statMask & 0xffffffff) == 0xffffffff) {
char mode[12];
r += ", st_dev = " + format_unsigned(s.st_dev); r += ", st_dev = " + format_unsigned(s.st_dev);
r += ", st_ino = " + format_unsigned(s.st_ino); r += ", st_ino = " + format_unsigned(s.st_ino);
}
if ((statMask & B_STAT_MODE) != 0) {
char mode[12];
snprintf(mode, sizeof(mode), "%03" B_PRIo32, snprintf(mode, sizeof(mode), "%03" B_PRIo32,
(uint32)(s.st_mode & ~(S_IFMT | S_ISUID | S_ISGID | S_ISVTX))); (uint32)(s.st_mode & ~(S_IFMT | S_ISUID | S_ISGID | S_ISVTX)));
r += ", st_mode = " + format_mode(context, s.st_mode & S_IFMT) + "|"; r += ", st_mode = " + format_mode(context, s.st_mode & S_IFMT) + "|";
r += mode; r += mode;
r += ", st_nlink = " + format_unsigned(s.st_nlink);
} }
if ((statMask & 0xffffffff) == 0xffffffff)
r += ", st_nlink = " + format_unsigned(s.st_nlink);
if ((statMask & B_STAT_UID) != 0) if ((statMask & B_STAT_UID) != 0)
r += ", st_uid = " + format_unsigned(s.st_uid); r += ", st_uid = " + format_unsigned(s.st_uid);
if ((statMask & B_STAT_GID) != 0) if ((statMask & B_STAT_GID) != 0)
@@ -93,6 +96,10 @@ read_stat(Context &context, Parameter *param, void *data)
r += ", st_type = " + format_unsigned(s.st_type); r += ", st_type = " + format_unsigned(s.st_type);
r += ", st_blocks = " + format_unsigned(s.st_blocks); r += ", st_blocks = " + format_unsigned(s.st_blocks);
} }
if (r.size() == 0)
return "{}";
return "{" + r.substr(2) + "}"; return "{" + r.substr(2) + "}";
} }