glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

printstr_ex: handle QUOTE_0_TERMINATED bit consistently

Browse Source 
When user_style has QUOTE_0_TERMINATED bit set, printstr_ex prints
the fetched string as a NUL-terminated.
After this change, the string is being fetched as a NUL-terminated, too.

* util.c (printstr_ex): Use umovestr instead of umoven
if QUOTE_0_TERMINATED bit is set.
This commit is contained in:
Дмитрий Левин
2016-11-19 21:01:03 +00:00
parent ead746af18
commit 03d65a05b9
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
util.c
View File

@ -827,8 +827,12 @@ printpath(struct tcb *tcp, long addr)
/* /*
* Print string specified by address `addr' and length `len'. * Print string specified by address `addr' and length `len'.
* If `len' < 0, treat the string as a NUL-terminated string. * If `len' == -1, set QUOTE_0_TERMINATED bit in `user_style'.
* If string length exceeds `max_strlen', append `...' to the output. * If `user_style' has QUOTE_0_TERMINATED bit set, treat the string
* as a NUL-terminated string.
* Pass `user_style' on to `string_quote'.
* Append `...' to the output if either the string length exceeds `max_strlen',
* or `len' != -1 and the string length exceeds `len'.
*/ */
void void
printstr_ex(struct tcb *tcp, long addr, long len, unsigned int user_style) printstr_ex(struct tcb *tcp, long addr, long len, unsigned int user_style)
@ -865,6 +869,9 @@ printstr_ex(struct tcb *tcp, long addr, long len, unsigned int user_style)
} else { } else {
if (size > (unsigned long) len) if (size > (unsigned long) len)
size = (unsigned long) len; size = (unsigned long) len;
if (style & QUOTE_0_TERMINATED)
rc = umovestr(tcp, addr, size, str);
else
rc = umoven(tcp, addr, size, str); rc = umoven(tcp, addr, size, str);
} }
if (rc < 0) { if (rc < 0) {