Fix memory allocation with Oracle 11g client when querying CLOBs using fetchAsString

Author: cjbj

src/njs/src/njsConnection.cpp

@@ -3324,6 +3324,17 @@ void Connection::DoDefines ( eBaton* executeBaton )
         executeBaton->extDefines[col] = new ExtDefine (
                                                   NJS_EXTDEFINE_CLOBASSTR ) ;
         executeBaton->extDefines[col]->fields.extClobAsStr.ctx = (void *) ctx;
+
+        executeBaton->extDefines[col]->fields.extClobAsStr.len2 =
+                ( unsigned int * ) malloc ( sizeof ( unsigned int ) *
+                                                     executeBaton->maxRows );
+        if( !executeBaton->extDefines[col]->fields.extClobAsStr.len2 )
+        {
+          executeBaton->error = NJSMessages::getErrorMsg (
+                                                errInsufficientMemory );
+          error = true;
+        }
+
       }
       else
       {
@@ -3369,6 +3380,8 @@ void Connection::DoFetch (eBaton* executeBaton)
        */
       for ( unsigned int row = 0; row < executeBaton->rowsFetched ; row ++ )
       {
+        define->len[row] = ( DPI_BUFLEN_TYPE )
+                           extDefine->fields.extClobAsStr.len2[row];
         define->len[row] += extDefine->fields.extClobAsStr.cLen ;
       }
     }
@@ -5579,8 +5592,8 @@ int Connection::cbDynBufferGet ( void *ctx, DPI_SZ_TYPE nRows,
     initialized.
 */
 int Connection::cbDynDefine ( void *octxp, unsigned long definePos,
-                               unsigned long iter, unsigned long *prevIter,
-                               void **bufpp, unsigned long **alenpp,
+                               unsigned int iter, unsigned long *prevIter,
+                               void **bufpp, unsigned int **alenpp,
                                void **indpp, unsigned short **rcodepp )
 {
   eBaton *executeBaton = (eBaton *) octxp ;
@@ -5618,11 +5631,14 @@ int Connection::cbDynDefine ( void *octxp, unsigned long definePos,
   }
   else
   {
-    define->len[iter] = maxLen;
+    extDefine->fields.extClobAsStr.len2[iter] = maxLen;
     define->ind[iter] = 0;                       // default value for indicator
 
     *bufpp = (void *) (&buf[iter][extDefine->fields.extClobAsStr.cLen]);
-    *alenpp = (unsigned long *) &(define->len[iter]) ;  // size for this iter
+
+    // size for this iter
+    *alenpp = (unsigned int *) &(extDefine->fields.extClobAsStr.len2[iter]) ;
+
     *indpp  = (void *) &(define->ind[iter]);            // indicator
   }
   return ret ;

src/njs/src/njsConnection.h

@@ -240,6 +240,7 @@ typedef struct ExtDefine
     {
       void *ctx;                    /* Context pointer used by the call back */
       DPI_BUFLEN_TYPE cLen;
+      unsigned int    *len2;        /* Length of the buffer */
     } extClobAsStr ;
   } fields;
 
@@ -250,6 +251,7 @@ typedef struct ExtDefine
       {
         fields.extClobAsStr.ctx = NULL ;
         fields.extClobAsStr.cLen = 0;
+        fields.extClobAsStr.len2 = NULL;
       }
   }
 } ExtDefine;
@@ -488,6 +490,8 @@ typedef struct eBaton
            {
              free ( extDefines[i]->fields.extClobAsStr.ctx );
              extDefines[i]->fields.extClobAsStr.ctx = NULL ;
+             free ( extDefines[i]->fields.extClobAsStr.len2 );
+             extDefines[i]->fields.extClobAsStr.len2 = NULL ;
              delete extDefines[i];
            }
          }
@@ -682,8 +686,8 @@ class Connection: public Nan::ObjectWrap
                                unsigned short **rcode, unsigned char *piecep );
 
   static int  cbDynDefine ( void *octxp, unsigned long definePos,
-                            unsigned long iter, unsigned long *prevIter,
-                            void **bufpp, unsigned long **alenpp,
+                            unsigned int iter, unsigned long *prevIter,
+                            void **bufpp, unsigned int **alenpp,
                             void **indpp, unsigned short **rcodepp );
 
   // Callback used in DML-Return SQL statements to

src/njs/src/njsResultSet.cpp

@@ -733,9 +733,11 @@ void ResultSet::clearFetchBuffer( unsigned int numRows )
      free(defineBuffers_[i].len);
      free(defineBuffers_[i].ind);
 
-     if ( extDefines_[i] )
+     if ( extDefines_[i] &&
+          extDefines_[i]->extDefType == NJS_EXTDEFINE_CLOBASSTR )
      {
        free ( extDefines_[i]->fields.extClobAsStr.ctx ) ;
+       free ( extDefines_[i]->fields.extClobAsStr.len2 ) ;
        delete ( extDefines_[i] );
      }
      extDefines_.resize ( 0 ) ;