WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tag len includes nullptr 

https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/tests/logprint_test.cpp;l=137;drc=3e3b6dc5e955fd9530c1d1bed8eee1726b91c59b
This commit is contained in:
vvb2060 2021-08-28 23:16:59 +08:00
parent 0495dd3e71
commit 18c3bb426f
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/cpp/daemon/logcat.cpp
View File

@ -60,11 +60,6 @@ private:
size_t verbose_print_count_ = 0; size_t verbose_print_count_ = 0;
bool verbose_ = true; bool verbose_ = true;
constexpr inline static auto kStartVerboseInst = "!!start_verbose!!"sv;
constexpr inline static auto kStopVerboseInst = "!!stop_verbose!!"sv;
constexpr inline static auto kRefreshVerboseInst = "!!refresh_verbose!!"sv;
constexpr inline static auto kRefreshModulesInst = "!!refresh_modules!!"sv;
}; };
int Logcat::PrintLogLine(const AndroidLogEntry &entry, FILE *out) { int Logcat::PrintLogLine(const AndroidLogEntry &entry, FILE *out) {
@ -115,9 +110,7 @@ void Logcat::ProcessBuffer(struct log_msg *buf) {
AndroidLogEntry entry; AndroidLogEntry entry;
if (android_log_processLogBuffer(&buf->entry, &entry) < 0) return; if (android_log_processLogBuffer(&buf->entry, &entry) < 0) return;
if (entry.tagLen >= 1 && entry.tag[entry.tagLen - 1] == '\0') [[likely]] { entry.tagLen--;
--entry.tagLen;
}
std::string_view tag(entry.tag, entry.tagLen); std::string_view tag(entry.tag, entry.tagLen);
bool shortcut = false; bool shortcut = false;
@ -133,14 +126,14 @@ void Logcat::ProcessBuffer(struct log_msg *buf) {
} }
if (entry.pid == getpid() && tag == "LSPosedLogcat"sv) [[unlikely]] { if (entry.pid == getpid() && tag == "LSPosedLogcat"sv) [[unlikely]] {
std::string_view msg(entry.message, entry.messageLen); std::string_view msg(entry.message, entry.messageLen);
if (msg == kStartVerboseInst) { if (msg == "!!start_verbose!!"sv) {
verbose_ = true; verbose_ = true;
verbose_print_count_ += PrintLogLine(entry, verbose_file_.get()); verbose_print_count_ += PrintLogLine(entry, verbose_file_.get());
} else if (msg == kStopVerboseInst) { } else if (msg == "!!stop_verbose!!"sv) {
verbose_ = false; verbose_ = false;
} else if (msg == kRefreshModulesInst) { } else if (msg == "!!refresh_modules!!"sv) {
RefreshFd(false); RefreshFd(false);
} else if (msg == kRefreshVerboseInst) { } else if (msg == "!!refresh_verbose!!"sv) {
RefreshFd(true); RefreshFd(true);
} }
} }