commit 06ada4ca711795c9997be4d928aed21b7d9612ca
author wei.du <wei.du@amlogic.com> Thu Jun 24 04:04:01 2021 -0400
committer wei.du <wei.du@amlogic.com> Thu Jun 24 04:05:01 2021 -0400
tree cb6d098f0389d8ef7c02740a2175e13bd5a0b7c4
parent aa08192ce3c111c171bcfeb0f567a830174888c5

audio: audiohal rebase from android R [1/1]

PD#SWPL-53508

Problem:
audiohal rebase from android R

Solution:
audiohal rebase from android R

Verify:
yocto-ap222

Change-Id: I1870254e6da05e84789299789e8f46ea578c53eb
Signed-off-by: wei.du <wei.du@amlogic.com>

utils/ini/IniParser.cpp

diff --git a/utils/ini/IniParser.cpp b/utils/ini/IniParser.cpp
index aba4b13..efcdf46 100644
--- a/utils/ini/IniParser.cpp
+++ b/utils/ini/IniParser.cpp
@@ -260,8 +260,8 @@
     pLine = new INI_LINE();
     if (pLine != NULL) {
         pLine->pNext = NULL;
-        strncpy(pLine->Name, name, CC_MAX_INI_LINE_NAME_LEN - 1);
-        strncpy(pLine->Value, value, CC_MAX_INI_FILE_LINE_LEN - 1);
+        strcpy(pLine->Name, name);
+        strcpy(pLine->Value, value);
 
 #if CC_MEMORY_NEW_DEL_TRACE == 1
         new_mem(__FUNCTION__, "pLine", pLine);
@@ -278,7 +278,7 @@
     if (pSec != NULL) {
         pSec->pLine = pLine;
         pSec->pNext = NULL;
-        strncpy(pSec->Name, section, CC_MAX_INI_LINE_NAME_LEN - 1);
+        strcpy(pSec->Name, section);
 
 #if CC_MEMORY_NEW_DEL_TRACE == 1
         new_mem(__FUNCTION__, "pSec", pSec);
@@ -331,13 +331,9 @@
                 pSec->pCurLine = pLine;
             } else {
                 if (set_mode == 1) {
-                    strncpy(pLine->Value, value, CC_MAX_INI_FILE_LINE_LEN - 1);
+                    strcpy(pLine->Value, value);
                 } else {
-                    int len = strlen(pLine->Value) + strlen(value);
-                    if (len > CC_MAX_INI_FILE_LINE_LEN - 1)
-                        len = CC_MAX_INI_FILE_LINE_LEN - 1;
-                    strncat(pLine->Value, value, len - strlen(pLine->Value));
-                    pLine->Value[len] = 0;
+                    strcat(pLine->Value, value);
                 }
             }
         }
@@ -356,11 +352,10 @@
 #if CC_MEMORY_NEW_DEL_TRACE == 1
 
 #define CC_MEM_RECORD_CNT    (1024)
-#define MEMND_MAX_NAME_LENGHT (50)
 
 typedef struct tag_memnd {
-    char fun_name[MEMND_MAX_NAME_LENGHT];
-    char var_name[MEMND_MAX_NAME_LENGHT];
+    char fun_name[50];
+    char var_name[50];
     void *ptr;
 } memnd;
 
@@ -371,16 +366,16 @@
 static int gMemDelInd = 0;
 
 static void new_mem(const char *fun_name, const char *var_name, void *ptr) {
-    strncpy(gMemNewItems[gMemNewInd].fun_name, fun_name, MEMND_MAX_NAME_LENGHT - 1);
-    strncpy(gMemNewItems[gMemNewInd].var_name, var_name, MEMND_MAX_NAME_LENGHT - 1);
+    strcpy(gMemNewItems[gMemNewInd].fun_name, fun_name);
+    strcpy(gMemNewItems[gMemNewInd].var_name, var_name);
     gMemNewItems[gMemNewInd].ptr = ptr;
 
     gMemNewInd += 1;
 }
 
 static void del_mem(const char *fun_name, const char *var_name, void *ptr) {
-    strncpy(gMemDelItems[gMemDelInd].fun_name, fun_name, MEMND_MAX_NAME_LENGHT - 1);
-    strncpy(gMemDelItems[gMemDelInd].var_name, var_name, MEMND_MAX_NAME_LENGHT - 1);
+    strcpy(gMemDelItems[gMemDelInd].fun_name, fun_name);
+    strcpy(gMemDelItems[gMemDelInd].var_name, var_name);
     gMemDelItems[gMemDelInd].ptr = ptr;
 
     gMemDelInd += 1;