github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-07 01:30:13 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrn-crashlog: remove unsafe strlen in common

Browse Source 
Remove strlen in common apis, and change their caller if necessary.

Tracked-On: #1254
Signed-off-by: Liu, Xinwu <xinwu.liu@intel.com>
Reviewed-by: Yonghua Huang <yonghua.huang@intel.com>
Acked-by: Chen Gang <gang.c.chen@intel.com>
This commit is contained in:
Liu, Xinwu
2018-09-27 14:00:34 +08:00
committed by Xie, Nanlin
parent f25bc50e68
commit 40dbdcde4f
14 changed files with 378 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/acrn-crashlog/common/cmdutils.c
View File

@@ -136,7 +136,7 @@ int exec_out2file(const char *outfile, const char *fmt, ...)
if (ret < 0)
return ret;
strtrim(cmd);
strtrim(cmd, ret);
argc = strcnt(cmd, ' ') + 1;
argv = (char **)calloc(argc + 1, sizeof(char *));
@@ -171,11 +171,12 @@ int exec_out2file(const char *outfile, const char *fmt, ...)
* to memory. The memory is allocated by this function and needs to be freed
* after return.
*
* @param[out] outmem The pointer to command's output.
* @param fmt Format string of command.
*
* @return a pointer to command's output if successful, or NULL if not.
* @return the length of command's output if successful, or -1 if not.
*/
char *exec_out2mem(const char *fmt, ...)
ssize_t exec_out2mem(char **outmem, const char *fmt, ...)
{
va_list args;
char *cmd;
@@ -183,23 +184,25 @@ char *exec_out2mem(const char *fmt, ...)
char *out = NULL;
char *new;
char tmp[1024];
int memsize = 0;
int newlen = 0;
int len = 0;
size_t memsize = 0;
size_t newlen = 0;
ssize_t len = 0;
int ret;
va_start(args, fmt);
ret = vasprintf(&cmd, fmt, args);
va_end(args);
if (ret < 0)
return NULL;
return -1;
pp = popen(cmd, "r");
if (!pp)
goto free_cmd;
if (!pp) {
free(cmd);
return -1;
}
while (fgets(tmp, 1024, pp) != NULL) {
newlen += strlen(tmp);
newlen += strnlen(tmp, 1024);
if (newlen + 1 > memsize) {
memsize += 1024;
new = realloc(out, memsize);
@@ -208,20 +211,22 @@ char *exec_out2mem(const char *fmt, ...)
free(out);
out = NULL;
}
len = -1;
goto end;
} else {
out = new;
}
}
memcpy(out + len, tmp, strlen(tmp) + 1);
/* fgets read at most 1023 bytes and plus '\0' */
memcpy(out + len, tmp, strnlen(tmp, 1024) + 1);
len = newlen;
}
end:
*outmem = out;
pclose(pp);
free_cmd:
free(cmd);
return out;
return len;
}