From: Volker Lendecke <vl@samba.org>
Date: Sun, 18 Aug 2013 19:37:56 +0000 (+0000)
Subject: samdb: Fix CID 1034910 Dereference before null check
X-Git-Tag: talloc-2.1.0~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c4e6f0cba164c91661a654e2ccc13c265a06953;p=thirdparty%2Fsamba.git

samdb: Fix CID 1034910 Dereference before null check

strncmp("tdb://", sam_name, 6) dereferences sam_name. Check for
NULL before that.

Signed-off-by: Volker Lendecke <vl@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index faaf3f2071c..93e8e978fd7 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -68,13 +68,13 @@ static int schema_metadata_open(struct ldb_module *module)
 	}
 
 	sam_name = (const char *)ldb_get_opaque(ldb, "ldb_url");
-	if (strncmp("tdb://", sam_name, 6) == 0) {
-		sam_name += 6;
-	}
 	if (!sam_name) {
 		talloc_free(tmp_ctx);
 		return ldb_operr(ldb);
 	}
+	if (strncmp("tdb://", sam_name, 6) == 0) {
+		sam_name += 6;
+	}
 	filename = talloc_asprintf(tmp_ctx, "%s.d/metadata.tdb", sam_name);
 	if (!filename) {
 		talloc_free(tmp_ctx);