prevented crash on deleting non-constructed analyse object

d5cd5ea4 · bell@sanja.is.com.ua · d7316689 · d5cd5ea4
Commit d5cd5ea4 authored Feb 18, 2003 by bell@sanja.is.com.ua
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

sql/sql_analyse.h sql/sql_analyse.h +6 -5

No files found.
--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@@ -288,11 +288,12 @@ class analyse: public Procedure
 public:
  uint max_tree_elements, max_treemem;

-  analyse(select_result *res) :Procedure(res, PROC_NO_SORT), rows(0),
-    output_str_length(0) {}
+  analyse(select_result *res) :Procedure(res, PROC_NO_SORT), f_info(0),
+    rows(0), output_str_length(0) {}

  ~analyse()
  {
+    if (f_info)
      for (field_info **f=f_info; f != f_end; f++)
 	delete (*f);
  }