Commit 641644a8 authored by Alexey Botchkov's avatar Alexey Botchkov

MDEV-8992 MariaDB crashes when accessing table with GIS features.

        we don't test for not-existing gis extra in FRM.
parent 3e043b30
...@@ -8326,6 +8326,9 @@ uint gis_field_options_read(const uchar *buf, uint buf_len, ...@@ -8326,6 +8326,9 @@ uint gis_field_options_read(const uchar *buf, uint buf_len,
*precision= *scale= *srid= 0; *precision= *scale= *srid= 0;
*st_type= Field_geom::GEOM_STORAGE_WKB; *st_type= Field_geom::GEOM_STORAGE_WKB;
if (!buf) /* can only happen with the old FRM file */
goto end_of_record;
while (cbuf < buf_end) while (cbuf < buf_end)
{ {
switch ((option_id= *(cbuf++))) switch ((option_id= *(cbuf++)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment