diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-11-10 18:08:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-11-10 18:08:17 +0400 |
| commit | b84a892fb2e6ee7fdedd04972e431a1457b7231f (patch) | |
| tree | add1bd5fb7812cea587747c35084ef0309a25be2 /sql/sql_string.h | |
| parent | 2da6f7cebae5a224f1f982981103a15a2ecda59a (diff) | |
| download | mariadb-git-b84a892fb2e6ee7fdedd04972e431a1457b7231f.tar.gz | |
MDEV-7019 String::chop() is wrong and may potentially crash (MySQL bug#56492)
Merging a fix from the upstream.
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 35398f284ee..1fce3ae6c6f 100644 --- 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() |