提交 09d7d656 编写于 作者: L laiguizhong

增加fullName检查

Signed-off-by: Nlaiguizhong <laiguizhong@huawei.com>
上级 3dd6477b
...@@ -242,19 +242,23 @@ static const char *BuildOSFullName(void) ...@@ -242,19 +242,23 @@ static const char *BuildOSFullName(void)
{ {
const char release[] = "Release"; const char release[] = "Release";
const char *releaseType = GetOsReleaseType(); const char *releaseType = GetOsReleaseType();
const char *fillname = GetFullName_(); const char *fullName = GetFullName_();
if ((releaseType != NULL) && (strncmp(releaseType, release, sizeof(release) - 1) != 0)) { if (fullName == NULL || releaseType == NULL) {
return NULL;
}
if (strncmp(releaseType, release, sizeof(release) - 1) != 0) {
char *value = calloc(1, OS_FULL_NAME_LEN); char *value = calloc(1, OS_FULL_NAME_LEN);
if (value == NULL) { if (value == NULL) {
return NULL; return NULL;
} }
int length = sprintf_s(value, OS_FULL_NAME_LEN, "%s(%s)", fillname, releaseType); int length = sprintf_s(value, OS_FULL_NAME_LEN, "%s(%s)", fullName, releaseType);
if (length < 0) { if (length < 0) {
free(value);
return NULL; return NULL;
} }
return value; return value;
} }
return strdup(fillname); return strdup(fullName);
} }
const char *GetOSFullName(void) const char *GetOSFullName(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册