]> git.sur5r.net Git - openldap/commitdiff
Fix dupsort fetch
authorHoward Chu <hyc@symas.com>
Fri, 19 Aug 2011 02:30:54 +0000 (19:30 -0700)
committerHoward Chu <hyc@symas.com>
Thu, 1 Sep 2011 23:31:10 +0000 (16:31 -0700)
libraries/libmdb/mdb.c

index 135c10359f41162e1b9a319adfd26cadb37d49b7..6baf0556d5be028a9cee30cb1f55d5e26f037f03 100644 (file)
@@ -2008,7 +2008,8 @@ mdb_cursor_set(MDB_cursor *cursor, MDB_val *key, MDB_val *data,
        cursor->mc_eof = 0;
 
        if (data) {
-               if ((rc = mdb_read_data(cursor->mc_txn, leaf, data)) != MDB_SUCCESS)
+               MDB_val d2;
+               if ((rc = mdb_read_data(cursor->mc_txn, leaf, &d2)) != MDB_SUCCESS)
                        return rc;
 
                if (cursor->mc_txn->mt_dbs[cursor->mc_dbi].md_flags & MDB_DUPSORT) {
@@ -2029,7 +2030,10 @@ mdb_cursor_set(MDB_cursor *cursor, MDB_val *key, MDB_val *data,
                                if (rc != MDB_SUCCESS)
                                        return rc;
                        }
+               } else {
+                       *data = d2;
                }
+
        }
 
        rc = mdb_set_key(leaf, key);