mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
Merge pull request #3162 from kailun-qin/null-on-error
libct/nsenter: nullify pointer on asprintf error
This commit is contained in:
@@ -146,8 +146,10 @@ static void write_log(const char *level, const char *format, ...)
|
||||
va_start(args, format);
|
||||
ret = vasprintf(&message, format, args);
|
||||
va_end(args);
|
||||
if (ret < 0)
|
||||
if (ret < 0) {
|
||||
message = NULL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
message = escape_json_string(message);
|
||||
|
||||
@@ -155,8 +157,10 @@ static void write_log(const char *level, const char *format, ...)
|
||||
stage = strdup("nsexec");
|
||||
else
|
||||
ret = asprintf(&stage, "nsexec-%d", current_stage);
|
||||
if (ret < 0)
|
||||
if (ret < 0) {
|
||||
stage = NULL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = asprintf(&json, "{\"level\":\"%s\", \"msg\": \"%s[%d]: %s\"}\n", level, stage, getpid(), message);
|
||||
if (ret < 0) {
|
||||
|
||||
Reference in New Issue
Block a user