diff --git a/apps/perf/src/main.c b/apps/perf/src/main.c index 1093a60d28b2b16744a72892de89a6163450ceb4..ca83e0161005e1df4eed0c338147ada672988557 100644 --- a/apps/perf/src/main.c +++ b/apps/perf/src/main.c @@ -63,9 +63,12 @@ int main(int argc, char **argv) } else if ((argc == THREE_ARGS) && strcmp(argv[1], "read") == 0) { size_t size = strtoul(argv[THREE_ARGS - 1], NULL, 0); char *buf = (char *)malloc(size); - int len = PerfRead(fd, buf, size); - PerfPrintBuffer(buf, len); - free(buf); + if (buf != NULL) { + int len = PerfRead(fd, buf, size); + PerfPrintBuffer(buf, len); + free(buf); + buf = NULL; + } } else if ((argc == TWO_ARGS) && strcmp(argv[1], "list") == 0) { PerfList(); } else if ((argc >= THREE_ARGS) && strcmp(argv[1], "stat") == 0) { diff --git a/kernel/common/los_config.c b/kernel/common/los_config.c index b022bab8d908239b23091680b7fc3a80b615bbeb..32b8592e7311674a0eca8bbae2794c1aa2033b83 100644 --- a/kernel/common/los_config.c +++ b/kernel/common/los_config.c @@ -183,7 +183,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsSystemInfo(VOID) KERNEL_NAME, KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE, buildType); } -LITE_OS_SEC_TEXT_INIT INT32 OsMain(VOID) +LITE_OS_SEC_TEXT_INIT UINT32 OsMain(VOID) { UINT32 ret; #ifdef LOS_INIT_STATISTICS diff --git a/kernel/common/los_config.h b/kernel/common/los_config.h index 974947ae7296281b4bd7455beb2753f042742c74..4182458abc4669c2ed56ecb22be3e347c3e4046e 100644 --- a/kernel/common/los_config.h +++ b/kernel/common/los_config.h @@ -453,7 +453,7 @@ typedef VOID (*log_read_write_fn)(UINT32 startAddr, UINT32 space, UINT32 rwFlag, VOID LOS_ExcInfoRegHook(UINT32 startAddr, UINT32 space, CHAR *buf, log_read_write_fn hook); #endif -extern INT32 OsMain(VOID); +extern UINT32 OsMain(VOID); typedef VOID (*SystemRebootFunc)(VOID); VOID OsSetRebootHook(SystemRebootFunc func); diff --git a/kernel/common/main.c b/kernel/common/main.c index 02e7a948150c31b76a05aeed643d64d3f5ea1d36..66f9e9860701fd2972ccc42a7bda61f8e51bead2 100644 --- a/kernel/common/main.c +++ b/kernel/common/main.c @@ -34,11 +34,9 @@ LITE_OS_SEC_TEXT_INIT INT32 main(VOID) { - UINT32 uwRet; - - uwRet = OsMain(); - if (uwRet != LOS_OK) { - return LOS_NOK; + UINT32 ret = OsMain(); + if (ret != LOS_OK) { + return (INT32)LOS_NOK; } CPU_MAP_SET(0, OsHwIDGet()); diff --git a/kernel/extended/trace/pipeline/trace_pipeline.c b/kernel/extended/trace/pipeline/trace_pipeline.c index b28d97f9765ab4b38aa7a290c0ec9b1f25a6cd7b..6ec57213c353359882c8a5a2eb1be219eac23e12 100644 --- a/kernel/extended/trace/pipeline/trace_pipeline.c +++ b/kernel/extended/trace/pipeline/trace_pipeline.c @@ -132,7 +132,7 @@ VOID OsTraceDataSend(UINT8 type, UINT16 len, UINT8 *data) UINT32 intSave; UINT8 outBuf[LOSCFG_TRACE_TLV_BUF_SIZE] = {0}; - if ((type > TRACE_MSG_MAX) || (len > LOSCFG_TRACE_TLV_BUF_SIZE)) { + if ((type >= TRACE_MSG_MAX) || (len > LOSCFG_TRACE_TLV_BUF_SIZE)) { return; }