Fixed memory issues with data classification

source/shared/core_sqlsrv.h

@@ -1436,7 +1436,7 @@ namespace data_classification {
     struct sensitivity_metadata;
 
     void name_id_pair_free(name_id_pair * pair);
-    void parse_sensitivity_name_id_pairs(_Inout_ sqlsrv_stmt* stmt, _Inout_ USHORT& numpairs, _Inout_ std::vector<name_id_pair*, sqlsrv_allocator<name_id_pair*>>& pairs, _Inout_ unsigned char **pptr TSRMLS_CC);
+    void parse_sensitivity_name_id_pairs(_Inout_ sqlsrv_stmt* stmt, _Inout_ USHORT& numpairs, _Inout_ std::vector<name_id_pair*, sqlsrv_allocator<name_id_pair*>>* pairs, _Inout_ unsigned char **pptr TSRMLS_CC);
     void parse_column_sensitivity_props(_Inout_ sensitivity_metadata* meta, _Inout_ unsigned char **pptr);
     USHORT fill_column_sensitivity_array(_Inout_ sqlsrv_stmt* stmt, _In_ SQLSMALLINT colno, _Inout_ zval *column_data TSRMLS_CC);
 

source/shared/core_stmt.cpp

@@ -262,8 +262,7 @@ void sqlsrv_stmt::clean_up_sensitivity_metadata()
 {
     if (current_sensitivity_metadata) {
         current_sensitivity_metadata->~sensitivity_metadata();
-        sqlsrv_free(current_sensitivity_metadata);
-        current_sensitivity_metadata = NULL;
+        current_sensitivity_metadata.reset();
     }
 }
 
@@ -968,7 +967,7 @@ field_meta_data* core_sqlsrv_field_metadata( _Inout_ sqlsrv_stmt* stmt, _In_ SQL
         }
     }
 
-    // Set the field name lenth
+    // Set the field name length
     meta_data->field_name_len = static_cast<SQLSMALLINT>( field_name_len );
 
     field_meta_data* result_field_meta_data = meta_data;
@@ -1052,8 +1051,8 @@ void core_sqlsrv_sensitivity_metadata( _Inout_ sqlsrv_stmt* stmt TSRMLS_DC )
         sensitivity_meta = new (sqlsrv_malloc(sizeof(sensitivity_metadata))) sensitivity_metadata();
 
         // Parse the name id pairs for labels first then info types
-        parse_sensitivity_name_id_pairs(stmt, sensitivity_meta->num_labels, sensitivity_meta->labels, &dcptr);
-        parse_sensitivity_name_id_pairs(stmt, sensitivity_meta->num_infotypes, sensitivity_meta->infotypes, &dcptr);
+        parse_sensitivity_name_id_pairs(stmt, sensitivity_meta->num_labels, &sensitivity_meta->labels, &dcptr);
+        parse_sensitivity_name_id_pairs(stmt, sensitivity_meta->num_infotypes, &sensitivity_meta->infotypes, &dcptr);
 
         // Next parse the sensitivity properties
         parse_column_sensitivity_props(sensitivity_meta, &dcptr);

source/shared/core_util.cpp

@@ -426,12 +426,18 @@ namespace data_classification {
     void convert_sensivity_field(_Inout_ sqlsrv_stmt* stmt, _In_ SQLSRV_ENCODING encoding, _In_ unsigned char *ptr, _In_ int len, _Inout_updates_bytes_(cchOutLen) char** field_name)
     {
         sqlsrv_malloc_auto_ptr<SQLWCHAR> temp_field_name;
-        int temp_field_len = len * 2;
+        int temp_field_len = len * sizeof(SQLWCHAR);
         SQLLEN field_name_len = 0;
 
+        if (len == 0) {
+            *field_name = reinterpret_cast<char*>(sqlsrv_malloc(1));
+            *field_name[0] = '\0';
+            return;
+        }
+
         temp_field_name = static_cast<SQLWCHAR*>(sqlsrv_malloc((len + 1) * sizeof(SQLWCHAR)));
+        memset(temp_field_name, L'\0', len + 1);
         memcpy_s(temp_field_name, temp_field_len, ptr, temp_field_len);
-        temp_field_name[temp_field_len] = '\0';
 
         bool converted = convert_string_from_utf16(encoding, temp_field_name, len, field_name, field_name_len);
 
@@ -450,14 +456,16 @@ namespace data_classification {
         }
         sqlsrv_free(pair);
     }
-
-    void parse_sensitivity_name_id_pairs(_Inout_ sqlsrv_stmt* stmt, _Inout_ USHORT& numpairs, _Inout_ std::vector<name_id_pair*, sqlsrv_allocator<name_id_pair*>>& pairs, _Inout_ unsigned char **pptr)
+    
+    void parse_sensitivity_name_id_pairs(_Inout_ sqlsrv_stmt* stmt, _Inout_ USHORT& numpairs, _Inout_ std::vector<name_id_pair*, sqlsrv_allocator<name_id_pair*>>* pairs, _Inout_ unsigned char **pptr)
     {
         unsigned char *ptr = *pptr;
         unsigned short npairs;
-        numpairs = npairs = *(unsigned short*)ptr;
+        numpairs = npairs = *(reinterpret_cast<unsigned short*>(ptr)); 
         SQLSRV_ENCODING encoding = ((stmt->encoding() == SQLSRV_ENCODING_DEFAULT ) ? stmt->conn->encoding() : stmt->encoding());
 
+        pairs->reserve(numpairs);
+
         ptr += sizeof(unsigned short);
         while (npairs--) {
             int namelen, idlen;
@@ -485,7 +493,7 @@ namespace data_classification {
             convert_sensivity_field(stmt, encoding, idptr, idlen, (char**)&id);
             pair->id = id;
 
-            pairs.push_back(pair.get());
+            pairs->push_back(pair.get());
             pair.transferred();
         }
         *pptr = ptr;
@@ -537,7 +545,7 @@ namespace data_classification {
         if (meta == NULL) {
             return 0;
         }
-
+       
         SQLSRV_ASSERT(colno >= 0 && colno < meta->num_columns, "fill_column_sensitivity_array: column number out of bounds");
 
         zval data_classification;

source/sqlsrv/stmt.cpp

@@ -538,7 +538,7 @@ PHP_FUNCTION( sqlsrv_field_metadata )
                                           TSRMLS_CC );
 
         if (stmt->data_classification) {
-            data_classification::fill_column_sensitivity_array(stmt, f, &field_array);
+            data_classification::fill_column_sensitivity_array(stmt, f, &field_array TSRMLS_CC);
         }
 
         // add this field's meta data to the result set meta data