summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2017-10-23 06:46:49 -0400
committerKotresh HR <khiremat@redhat.com>2017-10-23 06:52:22 -0400
commit738c38f0efa7b4d4dab0cf23d00589d68e4eb88d (patch)
tree90cfe6e768ed1579cc469c8b5fbe8a086c661186
parent2b3b3edee2d849b4aee314048987dc995d9679a1 (diff)
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 <khiremat@redhat.com> BUG: 1505325
-rw-r--r--xlators/features/changelog/lib/src/gf-history-changelog.c12
1 files 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 4355396..7362372 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;