Fix segfault when sorting LDAP replies on the client.

[samba.git] / source4 / lib / ldb / tools / ldbsearch.c

diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index c33cba1d77e725585ab18705d1922a1ffb065167..dba0549b4445e15c8e0f2a37cf97cc2ca4e7cb18 100644 (file)
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -241,10 +241,10 @@ again:
        if (sctx->pending)
                goto again;
 
-       if (sctx->sort && sctx->num_stored != 0) {
+       if (sctx->sort && (sctx->num_stored != 0 || sctx->refs != 0)) {
                int i;
 
-               ldb_qsort(sctx->store, ret, sizeof(struct ldb_message *),
+               ldb_qsort(sctx->store, sctx->num_stored, sizeof(struct ldb_message *),
                          ldb, (ldb_qsort_cmp_fn_t)do_compare_msg);
 
                if (ret != 0) {