Merge remote-tracking branch 'upstream/dremio-12.0-main' into lriggs-…

…dremio-12.0-main3
lriggs · Jun 28, 2023 · 8f40786 · 8f40786
2 parents c31f3f7 + ab2495b
commit 8f40786
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/cpp/src/gandiva/gdv_function_stubs.cc b/cpp/src/gandiva/gdv_function_stubs.cc
@@ -325,6 +325,7 @@ const char* gdv_fn_aes_encrypt(int64_t context, const char* data, int32_t data_l
     std::string err_msg =
         "Could not allocate memory for returning aes encrypt cypher text";
     gdv_fn_context_set_error_msg(context, err_msg.data());
+     *out_len = 0;
     return nullptr;
   }
 
@@ -333,6 +334,7 @@ const char* gdv_fn_aes_encrypt(int64_t context, const char* data, int32_t data_l
                                     reinterpret_cast<unsigned char*>(ret));
   } catch (const std::runtime_error& e) {
     gdv_fn_context_set_error_msg(context, e.what());
+     *out_len = 0;
     return nullptr;
   }
 
@@ -356,6 +358,7 @@ const char* gdv_fn_aes_decrypt(int64_t context, const char* data, int32_t data_l
     std::string err_msg =
         "Could not allocate memory for returning aes encrypt cypher text";
     gdv_fn_context_set_error_msg(context, err_msg.data());
+     *out_len = 0;
     return nullptr;
   }
 
@@ -364,6 +367,7 @@ const char* gdv_fn_aes_decrypt(int64_t context, const char* data, int32_t data_l
                                     reinterpret_cast<unsigned char*>(ret));
   } catch (const std::runtime_error& e) {
     gdv_fn_context_set_error_msg(context, e.what());
+     *out_len = 0;
     return nullptr;
   }