MDEV-7019 String::chop() is wrong and may potentially crash (MySQL bug#56492)

Merging a fix from the upstream.

MDEV-7019 String::chop() is wrong and may potentially crash (MySQL bug#56492)
Merging a fix from the upstream.
b84a892f · Alexander Barkov · 2da6f7ce · b84a892f
Commit b84a892f authored Nov 10, 2014 by Alexander Barkov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/sql_string.h sql/sql_string.h +3 -1

No files found.
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -232,7 +232,9 @@ public:
  */
  inline void chop()
  {
-    Ptr[str_length--]= '\0'; 
+    str_length--;
+    Ptr[str_length]= '\0';
+    DBUG_ASSERT(strlen(Ptr) == str_length);
  }

  inline void free()