[compiler-rt][nsan] Fix strsep interceptor #106307
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Alexander Shaposhnikov (alexander-shaposhnikov) ChangesFix strsep interceptor. Full diff: https://github.com/llvm/llvm-project/pull/106307.diff 2 Files Affected:
diff --git a/compiler-rt/lib/nsan/nsan_interceptors.cpp b/compiler-rt/lib/nsan/nsan_interceptors.cpp
index d607c8d6a636b8..f3422b92d0aeec 100644
--- a/compiler-rt/lib/nsan/nsan_interceptors.cpp
+++ b/compiler-rt/lib/nsan/nsan_interceptors.cpp
@@ -93,11 +93,14 @@ INTERCEPTOR(char *, strfry, char *s) {
}
INTERCEPTOR(char *, strsep, char **Stringp, const char *delim) {
+ if (*Stringp == nullptr)
+ return nullptr;
char *OrigStringp = REAL(strsep)(Stringp, delim);
- if (Stringp != nullptr) {
- // The previous character has been overwritten with a '\0' char.
- __nsan_set_value_unknown(reinterpret_cast<u8 *>(*Stringp) - 1, 1);
- }
+ // No delimiter was found, the token is taken to be the entire string.
+ if (*Stringp == nullptr)
+ return nullptr;
+ // The previous character has been overwritten with a '\0' char.
+ __nsan_set_value_unknown(reinterpret_cast<u8 *>(*Stringp) - 1, 1);
return OrigStringp;
}
diff --git a/compiler-rt/test/nsan/intercep_strsep.cpp b/compiler-rt/test/nsan/intercep_strsep.cpp
new file mode 100644
index 00000000000000..69accd53c4d3ad
--- /dev/null
+++ b/compiler-rt/test/nsan/intercep_strsep.cpp
@@ -0,0 +1,25 @@
+// RUN: %clangxx_nsan -O2 %s -o %t
+// RUN: %run %t 2>&1 | FileCheck %s
+
+#include <iostream>
+#include <cstring>
+
+extern "C" void __nsan_dump_shadow_mem(const char *addr, size_t size_bytes,
+ size_t bytes_per_line, size_t reserved);
+
+int main() {
+ // Define a C-style string with commas as delimiters
+ char input[] = "apple,banana,cherry,date";
+ char* token;
+ char* rest = input; // Pointer to keep track of the rest of the string
+
+ // Tokenize the string using strsep
+ while ((token = strsep(&rest, ",")) != NULL) {
+ std::cout << token << std::endl;
+ }
+
+ __nsan_dump_shadow_mem(&input[5], 1, 1, 0);
+ // CHECK: 0x{{[a-f0-9]*}}: _
+ return 0;
+}
+
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
alexander-shaposhnikov
force-pushed
the
fix_strsep
branch
2 times, most recently
from
3509d7f to
aba1a72
Compare
vitalybuka
reviewed
Aug 27, 2024
vitalybuka
approved these changes
Aug 28, 2024
alexander-shaposhnikov
force-pushed
the
fix_strsep
branch
from
aba1a72 to
62fe6c5
Compare
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/73/builds/4556 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix strsep interceptor.
For strsep description see https://www.man7.org/linux/man-pages/man3/strsep.3.html