From 91ef2afe1192a91a0f9339699590287904038666 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Feb 2003 10:18:51 +0200 Subject: prevented crash on deleting non-constructed analyse object --- sql/sql_analyse.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sql/sql_analyse.h') diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h index ce5c0af6a96..c826b69e53c 100644 --- a/sql/sql_analyse.h +++ b/sql/sql_analyse.h @@ -288,13 +288,14 @@ protected: 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() - { - for (field_info **f=f_info; f != f_end; f++) - delete (*f); + { + if (f_info) + for (field_info **f=f_info; f != f_end; f++) + delete (*f); } virtual void add() {} virtual bool change_columns(List &fields); -- cgit v1.2.1 From bf207b5fd43f45516e71943b813e277c7b134600 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Feb 2003 11:05:07 +0200 Subject: Indentation cleanup --- sql/sql_analyse.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sql/sql_analyse.h') diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h index c826b69e53c..faf79508f60 100644 --- a/sql/sql_analyse.h +++ b/sql/sql_analyse.h @@ -294,8 +294,10 @@ public: ~analyse() { if (f_info) + { for (field_info **f=f_info; f != f_end; f++) delete (*f); + } } virtual void add() {} virtual bool change_columns(List &fields); -- cgit v1.2.1