[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-113-g0998d17

[Tim Prouty]

The branch, master has been updated
       via  0998d172dbeb5f9d7198bbea9ee9124c0558f41b (commit)
      from  48a6feef402f7b91098341dc6e5eabbfd4beaa91 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0998d172dbeb5f9d7198bbea9ee9124c0558f41b
Author: Tim Prouty <tpro...@samba.org>
Date:   Fri Jan 23 16:09:13 2009 -0800

    s3 ldb: Fix vasprintf segfault that has been the source of build machine 
failures this week
    
    The bug was introduced when converting samba3's ldb_search interface
    to match samba4:
    47951fc5d0085e124666b7667715bba98076820e
    f3ecb701335b1129947127d4c45eef970b66875c

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/ldb/common/ldb.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ldb/common/ldb.c b/source3/lib/ldb/common/ldb.c
index 6e28528..cef7373 100644
--- a/source3/lib/ldb/common/ldb.c
+++ b/source3/lib/ldb/common/ldb.c
@@ -808,15 +808,18 @@ int ldb_search(struct ldb_context *ldb, TALLOC_CTX 
*mem_ctx, struct ldb_result *
        va_list ap;
        int ret;
 
+       expression = NULL;
        res = NULL;
        *result = NULL;
 
-       va_start(ap, exp_fmt);
-       expression = talloc_vasprintf(mem_ctx, exp_fmt, ap);
-       va_end(ap);
+       if (exp_fmt) {
+               va_start(ap, exp_fmt);
+               expression = talloc_vasprintf(mem_ctx, exp_fmt, ap);
+               va_end(ap);
 
-       if ( ! expression) {
-               return LDB_ERR_OPERATIONS_ERROR;
+               if ( ! expression) {
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
        }
 
        ret = _ldb_search(ldb, ldb, &res, base, scope, attrs, expression);


-- 
Samba Shared Repository