Skip to content

Commit

Permalink
Add a new interceptor for fparseln(3) from NetBSD
Browse files Browse the repository at this point in the history
Summary:
fparseln - returns the next logical line from a stream.

Add a dedicated test for this API.

Reviewers: vitalybuka, joerg

Reviewed By: vitalybuka

Subscribers: kubamracek, mgorny, llvm-commits, #sanitizers

Tags: #sanitizers

Differential Revision: https://reviews.llvm.org/D55019

llvm-svn: 348654
  • Loading branch information
krytarowski committed Dec 7, 2018
1 parent 737be83 commit 592898b
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 0 deletions.
25 changes: 25 additions & 0 deletions compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
Expand Up @@ -7752,6 +7752,30 @@ INTERCEPTOR(long long, strtonum, const char *nptr, long long minval,
#define INIT_STRTONUM
#endif

#if SANITIZER_INTERCEPT_FPARSELN
INTERCEPTOR(char *, fparseln, __sanitizer_FILE *stream, SIZE_T *len,
SIZE_T *lineno, const char delim[3], int flags) {
void *ctx;
COMMON_INTERCEPTOR_ENTER(ctx, fparseln, stream, len, lineno, delim, flags);
if (lineno)
COMMON_INTERCEPTOR_READ_RANGE(ctx, lineno, sizeof(*lineno));
if (delim)
COMMON_INTERCEPTOR_READ_RANGE(ctx, delim, sizeof(delim[0]) * 3);
char *ret = REAL(fparseln)(stream, len, lineno, delim, flags);
if (ret) {
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, REAL(strlen)(ret) + 1);
if (len)
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, len, sizeof(*len));
if (lineno)
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, lineno, sizeof(*lineno));
}
return ret;
}
#define INIT_FPARSELN COMMON_INTERCEPT_FUNCTION(fparseln)
#else
#define INIT_FPARSELN
#endif

static void InitializeCommonInterceptors() {
static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
Expand Down Expand Up @@ -8017,6 +8041,7 @@ static void InitializeCommonInterceptors() {
INIT_NL_LANGINFO;
INIT_MODCTL;
INIT_STRTONUM;
INIT_FPARSELN;

INIT___PRINTF_CHK;
}
Expand Up @@ -530,5 +530,6 @@
#define SANITIZER_INTERCEPT_NL_LANGINFO (SI_NETBSD || SI_FREEBSD)
#define SANITIZER_INTERCEPT_MODCTL SI_NETBSD
#define SANITIZER_INTERCEPT_STRTONUM SI_NETBSD
#define SANITIZER_INTERCEPT_FPARSELN SI_NETBSD

#endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H
25 changes: 25 additions & 0 deletions compiler-rt/test/sanitizer_common/TestCases/NetBSD/fparseln.cc
@@ -0,0 +1,25 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s

#include <assert.h>
#include <stdio.h>
#include <stdlib.h>

int main(void) {
printf("fparseln\n");

FILE *fp = fopen("/etc/fstab", "r");
assert(fp);

int flags = FPARSELN_UNESCALL;
const char *delim = "\\\\#";
size_t lineno = 0, len;
char *line;
while ((line = fparseln(fp, &len, &lineno, delim, flags))) {
printf("lineno: %zu, length: %zu, line: %s\n", lineno, len, line);
free(line);
}

// CHECK: fparseln

return 0;
}

0 comments on commit 592898b

Please sign in to comment.