svn commit: r562627 - in /apr/apr-util/branches/1.2.x: CHANGES dbm/apr_dbm_sdbm.c

[da...@apache.org]

Author: davi
Date: Fri Aug  3 17:17:07 2007
New Revision: 562627

URL: http://svn.apache.org/viewvc?view=rev&rev=562627
Log:
Backport revision 562623 from trunk:

The last two arguments to APR_DBM_FETCH were inverted, causing the datum of
the key to be used as the return datum and vice-versa. Found while investigating
PR 43025.

Modified:
    apr/apr-util/branches/1.2.x/CHANGES
    apr/apr-util/branches/1.2.x/dbm/apr_dbm_sdbm.c

Modified: apr/apr-util/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/CHANGES?view=diff&rev=562627&r1=562626&r2=562627
==============================================================================
--- apr/apr-util/branches/1.2.x/CHANGES (original)
+++ apr/apr-util/branches/1.2.x/CHANGES Fri Aug  3 17:17:07 2007
@@ -1,5 +1,8 @@
 Changes with APR-util 1.2.9
 
+  *) Fix improper datum copy for dbm fetch (apr_dbm_fetch) operations
+     on SDBM databases.  [Davi Arnaut]
+
   *) Fix Solaris 2.8+ fdatasync() detection. The fdatasync() function
      is marked as part of the Realtime library functions.
      PR 37343.  [Davi Arnaut]

Modified: apr/apr-util/branches/1.2.x/dbm/apr_dbm_sdbm.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/dbm/apr_dbm_sdbm.c?view=diff&rev=562627&r1=562626&r2=562627
==============================================================================
--- apr/apr-util/branches/1.2.x/dbm/apr_dbm_sdbm.c (original)
+++ apr/apr-util/branches/1.2.x/dbm/apr_dbm_sdbm.c Fri Aug  3 17:17:07 2007
@@ -140,7 +140,7 @@
     result_datum_t rd;
 
     CONVERT_DATUM(ckey, &key);
-    rv = APR_DBM_FETCH(dbm->file, ckey, rd);
+    rv = APR_DBM_FETCH(dbm->file, rd, ckey);
     RETURN_DATUM(pvalue, rd);
 
     REGISTER_CLEANUP(dbm, pvalue);