apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1001083 - in /apr/apr-util/branches/1.3.x: CHANGES dbd/apr_dbd_odbc.c
Date Fri, 24 Sep 2010 21:21:30 GMT
Author: trawick
Date: Fri Sep 24 21:21:30 2010
New Revision: 1001083

URL: http://svn.apache.org/viewvc?rev=1001083&view=rev
Log:
merge r1001073 from apr trunk

DBD ODBC support: Fix memory corruption using apr_dbd_datum_get() with
several different data types, including APR_DBD_TYPE_TIME.

PR: 49645
Submitted by: <kappa psilambda.com>
Reviewed by: trawick

Modified:
    apr/apr-util/branches/1.3.x/CHANGES
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_odbc.c

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=1001083&r1=1001082&r2=1001083&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Fri Sep 24 21:21:30 2010
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.3.10
 
+  *) DBD ODBC support: Fix memory corruption using apr_dbd_datum_get() with
+     several different data types, including APR_DBD_TYPE_TIME.  PR 49645.
+     [<kappa psilambda.com>]
+
   *) Add support for Berkeley DB 5.0. [Bernhard Rosenkraenzer
      <br blankpage.ch>]
 

Modified: apr/apr-util/branches/1.3.x/dbd/apr_dbd_odbc.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/apr_dbd_odbc.c?rev=1001083&r1=1001082&r2=1001083&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/apr_dbd_odbc.c (original)
+++ apr/apr-util/branches/1.3.x/dbd/apr_dbd_odbc.c Fri Sep 24 21:21:30 2010
@@ -1324,7 +1324,7 @@ static apr_status_t odbc_datum_get(const
         return APR_ENOENT;          /* SQL NULL value */
     
     if (len < 0)
-        strcpy(data, p);
+       *(char**)data = (char *)p;
     else
         memcpy(data, p, len);
     



Mime
View raw message