From da1af500a5d4cc53b3596f7eda76135e86d8b413 Mon Sep 17 00:00:00 2001
From: Christopher Jones <christopher.jones@oracle.com>
Date: Thu, 16 Mar 2017 16:01:16 +1100
Subject: [PATCH] Fix memory leak with fetchAsString/fetchAsBuffer

---
 src/njs/src/njsConnection.h  | 10 ++++++++++
 src/njs/src/njsResultSet.cpp | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/njs/src/njsConnection.h b/src/njs/src/njsConnection.h
index 6fc284d3..2af85622 100644
--- a/src/njs/src/njsConnection.h
+++ b/src/njs/src/njsConnection.h
@@ -483,6 +483,16 @@ typedef struct eBaton
            }
          }
 
+         // If Blob data was fetched as Buffer, deallocate each buffer
+         if ( (defines[i].fetchType == dpi::DpiRaw) &&
+              mInfo[i].dbType == dpi::DpiBlob )
+         {
+           for ( unsigned int j = 0 ; j < maxRows ; j ++ )
+           {
+             free ( ((char **)(defines[i].buf))[j] );
+           }
+         }
+
          /*
           * Buf and indicator will be allocated in all cases.
           * len will NOT be allocated for CLOB-as-STRING/BLOB-as-BUFFER
diff --git a/src/njs/src/njsResultSet.cpp b/src/njs/src/njsResultSet.cpp
index 4eea878b..8e893dfe 100644
--- a/src/njs/src/njsResultSet.cpp
+++ b/src/njs/src/njsResultSet.cpp
@@ -711,6 +711,7 @@ void ResultSet::clearFetchBuffer( unsigned int numRows )
    {
      if ( defineBuffers_[i].dttmarr )
      {
+       /* Date/Timestamp columns */
        defineBuffers_[i].dttmarr->release ();
        defineBuffers_[i].extbuf = NULL;
      }
@@ -718,6 +719,7 @@ void ResultSet::clearFetchBuffer( unsigned int numRows )
                  ( defineBuffers_[i].fetchType == DpiBlob ) ||
                  ( defineBuffers_[i].fetchType == DpiBfile ) )
      {
+       /* Lob columns */
        for (unsigned int j = 0; j < numRows; j++)
        {
          if (((Descriptor **)(defineBuffers_[i].buf))[j])
@@ -727,6 +729,21 @@ void ResultSet::clearFetchBuffer( unsigned int numRows )
          }
        }
      }
+     else if ( ( ( defineBuffers_[i].fetchType == dpi::DpiVarChar ) &&
+                 ( mInfo_[i].dbType == dpi::DpiClob ) ) ||
+               ( ( defineBuffers_[i].fetchType == dpi::DpiRaw ) &&
+                 ( mInfo_[i].dbType == dpi::DpiBlob ) ) )
+     {
+       /* CLOB-as-STRING or BLOB-as-BUFFER case */
+       for ( unsigned int j = 0 ; j < numRows ; j ++ )
+       {
+         if ( ( (char **)defineBuffers_[i].buf)[j] )
+         {
+           free ( ( (char **)defineBuffers_[i].buf)[j] );
+           ( ( char **)defineBuffers_[i].buf)[j] = NULL ;
+         }
+       }
+     }
 
      free(defineBuffers_[i].buf);
      free(defineBuffers_[i].len);