openharmony/drivers_adapter_khdf_linux
1
0
Fork 0
mirror of https://gitee.com/openharmony/drivers_adapter_khdf_linux synced 2024-11-26 22:30:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!285 fix: modify the review problem of osal log

Browse Source 
Merge pull request !285 from Zhang/OpenHarmony-3.1-Release
This commit is contained in:
openharmony_ci 2022-03-25 02:32:36 +00:00 committed by Gitee
commit c2122b8669
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osal/src/osal_deal_log_format.c
View File

@ -23,6 +23,7 @@
static const char *g_property[NUMBER] = {"%{private}", "%{public}"};
static size_t g_property_len[NUMBER] = {10, 9};
/* remove "{private}" and "{public}" from fmt and copy to dest */
bool deal_format(const char *fmt, char *dest, size_t size)
{
const char *ptr = fmt;
@ -31,7 +32,7 @@ bool deal_format(const char *fmt, char *dest, size_t size)
size_t index = 0;
size_t i;
if (fmt == NULL || dest == NULL || size == 0) {
if (fmt == NULL || dest == NULL || size == 0 || strlen(fmt) >= (size - 1)) {
printk("%s invalid para", __func__);
return false;
}
@ -40,6 +41,7 @@ bool deal_format(const char *fmt, char *dest, size_t size)
if (*ptr_cur == '%') {
for (i = 0; i < NUMBER; i++) {
if (strncmp(ptr_cur, g_property[i], g_property_len[i]) == 0) {
/* add 1 is for to copy char '%' */
ret = strncpy_s(&dest[index], size - index, ptr, ptr_cur - ptr + 1);
if (ret != EOK) {
printk("%s strncpy_s error %d", __func__, ret);