From 4ef1df4e9d8ec6e4b120b2f059ecc2f3ab931b93 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Tue, 5 Aug 2014 13:44:04 +0300
Subject: [PATCH] Bug #468, http://bugs.skysql.com/show_bug.cgi?id=468, Query
 classifier accessed freed thread context. If parsing fails thd doesn't need
 to be freed because it holds correct information about command type.

---
 query_classifier/query_classifier.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index eccc35a31..889940e00 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -149,17 +149,17 @@ skygw_query_type_t skygw_query_classifier_get_type(
         thd = get_or_create_thd_for_parsing(mysql, query_str);
 
         if (thd == NULL) 
-        {
-                skygw_query_classifier_free(mysql);
-        }
-        /** Create parse_tree inside thd */
-        failp = create_parse_tree(thd);
-
-        if (failp) 
         {
                 skygw_query_classifier_free(mysql);
                 *p_mysql = NULL;
+                goto return_qtype;
         }
+        /** 
+         * Create parse_tree inside thd.
+         * thd and even lex are readable even if parser failed so let it 
+         * continue despite failure.
+         */
+        failp = create_parse_tree(thd);
         qtype = resolve_query_type(thd);
 
         if (p_mysql == NULL)
@@ -464,7 +464,7 @@ static skygw_query_type_t resolve_query_type(
                 type |= QUERY_TYPE_DISABLE_AUTOCOMMIT;  
                 type |= QUERY_TYPE_BEGIN_TRX;
         }
-        /**
+       /**
         * REVOKE ALL, ASSIGN_TO_KEYCACHE,
         * PRELOAD_KEYS, FLUSH, RESET, CREATE|ALTER|DROP SERVER
         */