svn commit: r1065258 - in /apr/apr/trunk: CHANGES dbd/apr_dbd_oracle.c

[ni...@apache.org]

Author: niq
Date: Sun Jan 30 12:51:48 2011
New Revision: 1065258

URL: http://svn.apache.org/viewvc?rev=1065258&view=rev
Log:
Fix endianness issue in Oracle driver
PR 50690 - Patch from Stefan Ruppert

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/dbd/apr_dbd_oracle.c

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1065258&r1=1065257&r2=1065258&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Sun Jan 30 12:51:48 2011
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 2.0.0
 
+  *) apr_dbd_oracle: fix endianness issue in prepared statements
+     PR 50690 [Stefan Ruppert <sr myarm.com>]
+
   *) Fix address handling when accepting an AF_INET socket from a socket
      bound as AF_INET6.   PR 49678.  [Joe Orton]     
 

Modified: apr/apr/trunk/dbd/apr_dbd_oracle.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_oracle.c?rev=1065258&r1=1065257&r2=1065258&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_oracle.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_oracle.c Sun Jan 30 12:51:48 2011
@@ -860,6 +860,7 @@ static int dbd_oracle_prepare(apr_pool_t
     int ret = 0;
     int i;
     apr_dbd_prepared_t *stmt ;
+    apr_int16_t type;
 
     if (*statement == NULL) {
         *statement = apr_pcalloc(pool, sizeof(apr_dbd_prepared_t));
@@ -895,11 +896,12 @@ static int dbd_oracle_prepare(apr_pool_t
                               apr_pool_cleanup_null);
 
     /* Perl gets statement type here */
-    sql->status = OCIAttrGet(stmt->stmt, OCI_HTYPE_STMT, &stmt->type, 0,
+    sql->status = OCIAttrGet(stmt->stmt, OCI_HTYPE_STMT, &type, 0,
                              OCI_ATTR_STMT_TYPE, sql->err);
     if (sql->status != OCI_SUCCESS) {
         return 1;
     }
+    stmt->type = type;
 
 /* Perl sets PREFETCH_MEMORY here, but the docs say there's a working default */
 #if 0