diff options
author | Michael Widenius <monty@askmonty.org> | 2011-05-11 15:59:42 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-05-11 15:59:42 +0300 |
commit | f940c2ca14516268e3ed75cb93b69c7876fdc09f (patch) | |
tree | 669cedf480afff3e778d6895dde618af87b241d8 /mysql-test/r/dyncol.result | |
parent | 8d52c2cffe0ff75ea9a4313c776cc5441e70aef3 (diff) | |
download | mariadb-git-f940c2ca14516268e3ed75cb93b69c7876fdc09f.tar.gz |
Fixed a memory overrun in dynamic columns when sending in a mailformed (too short in this case) string.
mysql-test/t/dyncol.test:
Added test case for mailformed string usage
mysys/ma_dyncol.c:
Added test for wrong dynamic string data
Diffstat (limited to 'mysql-test/r/dyncol.result')
-rw-r--r-- | mysql-test/r/dyncol.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result index 850c7519784..aaa942f455a 100644 --- a/mysql-test/r/dyncol.result +++ b/mysql-test/r/dyncol.result @@ -1228,3 +1228,9 @@ NULL NULL 0002000100030200230861626308636465 2 SELECT COLUMN_ADD(f1, 1, 'abc'), COLUMN_LIST(f1) FROM t1; DROP TABLE t1; +# +# Some dynamic strings that caused crashes in the past +# +set @a=0x0102000200030004000F0D086B74697A6A7176746F6B687563726A746E7A746A666163726C6F7A6B62636B6B756B666779666977617369796F67756C726D62677A72756E63626D78636D7077706A6F736C6D636464696770786B6371637A6A6A6463737A6A676879716462637178646C666E6B6C726A637677696E7271746C616D646368687A6C707869786D666F666261797470616A63797673737A796D74747475666B717573687A79696E7276706F796A6E767361796A6F6D646F6378677A667074746363736A796D67746C786F697873686464616265616A7A6F7168707A6B776B6376737A6B72666C6F666C69636163686F6B666D627166786A71616F; +select column_add(@a, 3, "a"); +ERROR HY000: Encountered illegal format of dynamic column string |