diff --git a/include/debug_logger.h b/include/debug_logger.h index d5b803f4c2e3f6c2cc59e2727bc4979844242561..6e2ff8935ec9d479a1aae1855c80aaf975cbfcdc 100755 --- a/include/debug_logger.h +++ b/include/debug_logger.h @@ -299,8 +299,8 @@ public: if (!showError_) { DebugLogger::GetInstance()->Log(level_, HILOG_TAG, "%s\n", buffer_.str().c_str()); } else { - DebugLogger::GetInstance()->Log(level_, HILOG_TAG, "%s (errno %d:%s)\n", - buffer_.str().c_str(), errno, strerror(errno)); + DebugLogger::GetInstance()->Log(level_, HILOG_TAG, "%s (errno %d)\n", + buffer_.str().c_str(), errno); } } } diff --git a/src/elf_file.cpp b/src/elf_file.cpp index 285fc585dd41fbb9f9ca38eb90b32a2d3e8e587a..81308f7cef0a4cd7ec84acd8375a16f1fc784d53 100755 --- a/src/elf_file.cpp +++ b/src/elf_file.cpp @@ -185,7 +185,7 @@ bool ElfFile::ParseSecNamesStr() HLOG_ASSERT(ret == static_cast(secOffset)); char *secNamesBuf = new (std::nothrow) char[secSize]; if (secNamesBuf == nullptr) { - HLOGE("new secNamesBuf failed"); + HLOGE("Error in ElfFile::ParseSecNamesStr(): new secNamesBuf failed"); return false; } memset_s(secNamesBuf, secSize, '\0', secSize); diff --git a/src/perf_event_record.cpp b/src/perf_event_record.cpp index 9b2aa9e781175a75a0691b1e6eb270bf0543e2f1..91b22d3a9b9f565053b1f11a048570faece32313 100755 --- a/src/perf_event_record.cpp +++ b/src/perf_event_record.cpp @@ -228,7 +228,10 @@ void PerfRecordSample::ReplaceWithCallStack(size_t originalSize) PerfRecordSample::PerfRecordSample(uint8_t *p, const perf_event_attr &attr) : PerfEventRecord(p, "sample") { - HLOG_ASSERT(p); + if (p == nullptr) { + HLOG_ASSERT(p); + return; + } sampleType_ = attr.sample_type; p += sizeof(header); diff --git a/src/perf_file_reader.cpp b/src/perf_file_reader.cpp index d630fb9055b24377f830bf9504b9c68d5240e3dd..7e0d78363f1c347f57cc4a2bbda1a2eaba74c5c6 100755 --- a/src/perf_file_reader.cpp +++ b/src/perf_file_reader.cpp @@ -316,8 +316,9 @@ bool PerfFileReader::ReadRecord(ProcessRecordCB &callback) bool PerfFileReader::Read(void *buf, size_t len) { - HLOG_ASSERT(buf != nullptr); - if (len == 0) { + if (buf == nullptr || len == 0) { + HLOG_ASSERT(buf != nullptr); + HLOG_ASSERT(len > 0); return false; } @@ -335,9 +336,11 @@ const perf_file_header &PerfFileReader::GetHeader() const bool PerfFileReader::Read(char *buf, uint64_t offset, size_t len) { - HLOG_ASSERT(buf != nullptr); - HLOG_ASSERT(len > 0); - + if (buf == nullptr || len == 0) { + HLOG_ASSERT(buf != nullptr); + HLOG_ASSERT(len > 0); + return false; + } if (fseek(fp_, offset, SEEK_SET) != 0) { HLOGE("fseek() failed"); return false;