MENT-361 ASAN heap-use-after-free in filter_query_type upon

concurrent flow with server auditing under PS protocol

restore correct THD::query_string in Prepared_statement::reparepare().

1 files changed, 9 insertions, 0 deletions

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index cea8e7730c1..9e922c9c2f0 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -4572,6 +4572,15 @@ Prepared_statement::reprepare()
     */
     thd->get_stmt_da()->clear_warning_info(thd->query_id);
   }
+  else
+  {
+    /*
+       Prepare failed and the 'copy' will be freed.
+       Now we have to restore the query_string in the so the
+       audit plugin later gets the meaningful notification.
+    */
+    thd->set_query(query(), query_length());
+  }
   return error;
 }