summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-07-14 23:57:14 +0300
committerunknown <bell@sanja.is.com.ua>2004-07-14 23:57:14 +0300
commitbde7d0932cb56a846c81f081ac9c4e21cb69e004 (patch)
tree2efcfaa93872360cfd7870d2d6cdcb4bf5e25fc0 /sql/item_subselect.cc
parentdd01a13a5b36635432c2fe067a0710b8c10b7989 (diff)
downloadmariadb-git-bde7d0932cb56a846c81f081ac9c4e21cb69e004.tar.gz
stack overflow check added for subqueries processing (BUG#4554)
sql/item_subselect.cc: stack overflow check added for subqueries processing
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 4c1ffeecc97..3d5a11a26bc 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -128,7 +128,12 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref)
stmt= thd->current_statement;
char const *save_where= thd->where;
- int res= engine->prepare();
+ int res;
+
+ if (check_stack_overrun(thd, (gptr)&res))
+ return 1;
+
+ res= engine->prepare();
// all transformetion is done (used by prepared statements)
changed= 1;