From c3c69229414b778d0035dd90e3d71b48b7ff0ee6 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Fri, 16 Nov 2018 09:10:06 -0500 Subject: [PATCH] app/trace: fix app_name dereference on init In case when only file_name was provided, app_name was still dereferenced. Change-Id: Ica948e072ef02a8daadf303b3e2a004640d19000 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/433609 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- app/trace/trace.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/trace/trace.cpp b/app/trace/trace.cpp index 4c42c5ec5..5dbd17e30 100644 --- a/app/trace/trace.cpp +++ b/app/trace/trace.cpp @@ -341,15 +341,14 @@ int main(int argc, char **argv) exit(1); } - if (shm_id >= 0) { - snprintf(shm_name, sizeof(shm_name), "/%s_trace.%d", app_name, shm_id); - } else { - snprintf(shm_name, sizeof(shm_name), "/%s_trace.pid%d", app_name, shm_pid); - } - if (file_name) { fd = open(file_name, O_RDONLY); } else { + if (shm_id >= 0) { + snprintf(shm_name, sizeof(shm_name), "/%s_trace.%d", app_name, shm_id); + } else { + snprintf(shm_name, sizeof(shm_name), "/%s_trace.pid%d", app_name, shm_pid); + } fd = shm_open(shm_name, O_RDONLY, 0600); } if (fd < 0) {