Check for NULL pointer before calling remove_current_table_from_rpl_table_list().

af71a9cb · Will DeVries · Sergei Petrunia · 3b30a12c · af71a9cb
Commit af71a9cb authored Jan 09, 2020 by Will DeVries Committed by Sergei Petrunia Mar 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

storage/clustrixdb/ha_clustrixdb_pushdown.cc storage/clustrixdb/ha_clustrixdb_pushdown.cc +4 -2

No files found.
--- a/storage/clustrixdb/ha_clustrixdb_pushdown.cc
+++ b/storage/clustrixdb/ha_clustrixdb_pushdown.cc
@@ -212,7 +212,8 @@ ha_clustrixdb_select_handler::~ha_clustrixdb_select_handler()
    if (table__)
      my_bitmap_free(&scan_fields);

-    remove_current_table_from_rpl_table_list(rgi);
+    if (rgi)
+        remove_current_table_from_rpl_table_list(rgi);
 }

 /*@brief  Initiate the query for select_handler           */
@@ -357,7 +358,8 @@ ha_clustrixdb_derived_handler::~ha_clustrixdb_derived_handler()
    if (table__)
      my_bitmap_free(&scan_fields);

-    remove_current_table_from_rpl_table_list(rgi);
+    if (rgi)
+        remove_current_table_from_rpl_table_list(rgi);
 }

 /*@brief  Initiate the query for derived_handler           */