fix val_str_ascii to return a string in the ascii-compatible charset.

two items didn't do that properly, one was exploitable, the other was not, but fixed anyway.

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index fdd3cab8273..3648b10af3f 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -135,6 +135,7 @@ String *Item_func_as_wkt::val_str_ascii(String *str)
     return 0;
 
   str->length(0);
+  str->set_charset(&my_charset_latin1);
   if ((null_value= geom->as_wkt(str, &dummy)))
     return 0;
 
@@ -182,7 +183,7 @@ String *Item_func_geometry_type::val_str_ascii(String *str)
   /* String will not move */
   str->copy(geom->get_class_info()->m_name.str,
 	    geom->get_class_info()->m_name.length,
-	    default_charset());
+            &my_charset_latin1);
   return str;
 }