maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Correct the return value of strlcat(3) in the interceptor 

Late fix for SVN r. 324034
Add new interceptors: strlcpy(3) and strlcat(3)

There was forgotten an addition of len to the return value.

llvm-svn: 324091
This commit is contained in:
Kamil Rytarowski 2018-02-02 13:56:52 +00:00
parent 26f2eec212
commit 42983551bd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
View File

@ -6741,16 +6741,15 @@ INTERCEPTOR(SIZE_T, strlcpy, char *dst, char *src, SIZE_T size) {
INTERCEPTOR(SIZE_T, strlcat, char *dst, char *src, SIZE_T size) {
void *ctx;
SIZE_T len = 0;
COMMON_INTERCEPTOR_ENTER(ctx, strlcat, dst, src, size);
// src is checked in the strlcpy() interceptor
if (dst) {
SIZE_T len = REAL(strnlen)(dst, size);
len = REAL(strnlen)(dst, size);
COMMON_INTERCEPTOR_READ_STRING(ctx, dst, Min(len, size - 1) + 1);
// Reuse the rest of the code in the strlcpy() interceptor
dst += len;
size -= len;
}
return WRAP(strlcpy)(dst, src, size);
// Reuse the rest of the code in the strlcpy() interceptor
return WRAP(strlcpy)(dst + len, src, size - len) + len;
}
#define INIT_STRLCPY \
COMMON_INTERCEPT_FUNCTION(strlcpy); \