Fix Coverity id 333, a dereference before a NULL check.

Metze, you wanted to port talloc_get_type_abort() to 4. Should I just use it
in 3-ldb?

Volker

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_0@19942 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/lib/ldb/ldb_tdb/ldb_index.c b/source/lib/ldb/ldb_tdb/ldb_index.c
index d7a8e5e9b5fc5abd0e4387129611a34b515457be..2c88d7e19db748ba0d0b27c5869e046c7ca7c158 100644 (file)
--- a/source/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source/lib/ldb/ldb_tdb/ldb_index.c
@@ -721,12 +721,15 @@ static int ltdb_index_filter(const struct dn_list *dn_list,
 */
 int ltdb_search_indexed(struct ldb_handle *handle)
 {
-       struct ltdb_context *ac = talloc_get_type(handle->private_data, struct ltdb_context);
-       struct ltdb_private *ltdb = talloc_get_type(ac->module->private_data, struct ltdb_private);
+       struct ltdb_context *ac;
+       struct ltdb_private *ltdb;
        struct dn_list *dn_list;
        int ret;
 
-       if ((ac == NULL) || (ltdb == NULL)) {
+       if (!(ac = talloc_get_type(handle->private_data,
+                                  struct ltdb_context)) ||
+           !(ltdb = talloc_get_type(ac->module->private_data,
+                                    struct ltdb_private))) {
                return -1;
        }