From 738c38f0efa7b4d4dab0cf23d00589d68e4eb88d Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Mon, 23 Oct 2017 06:46:49 -0400 Subject: libgfchangelog: Fix possible null pointer dereference If pthread_attr_init fails, gf_msg uses this->name where 'this' is not initialized yet. This patch fixes the same. Change-Id: Ie004cbe1015a0d62fc3b5512e8954c5606eeeb5f Signed-off-by: Kotresh HR BUG: 1505325 --- xlators/features/changelog/lib/src/gf-history-changelog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xlators/features/changelog/lib/src/gf-history-changelog.c b/xlators/features/changelog/lib/src/gf-history-changelog.c index 4355396a147..736237219f4 100644 --- a/xlators/features/changelog/lib/src/gf-history-changelog.c +++ b/xlators/features/changelog/lib/src/gf-history-changelog.c @@ -802,6 +802,12 @@ gf_history_changelog (char* changelog_dir, unsigned long start, pthread_attr_t attr; + this = THIS; + if (!this) { + ret = -1; + goto out; + } + ret = pthread_attr_init (&attr); if (ret != 0) { gf_msg (this->name, GF_LOG_ERROR, errno, @@ -810,12 +816,6 @@ gf_history_changelog (char* changelog_dir, unsigned long start, return -1; } - this = THIS; - if (!this) { - ret = -1; - goto out; - } - jnl = (gf_changelog_journal_t *) GF_CHANGELOG_GET_API_PTR (this); if (!jnl) { ret = -1; -- cgit