diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-07-26 09:52:16 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-07-26 09:52:16 +0200 |
| commit | 80ee86d2aad2ddee41cc1806bb7a5d390555b031 (patch) | |
| tree | 750e6254ec99250a12e53db8a60ef85f7707ef4a /storage/connect/valblk.cpp | |
| parent | 81e5c5db3b1a9deff558d31843ebddab513042d3 (diff) | |
| download | mariadb-git-80ee86d2aad2ddee41cc1806bb7a5d390555b031.tar.gz | |
- Restrict memcpy length in CHRBLK::SetValue
modified:
storage/connect/valblk.cpp
Diffstat (limited to 'storage/connect/valblk.cpp')
| -rw-r--r-- | storage/connect/valblk.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp index cee4571bc0d..7b52c598771 100644 --- a/storage/connect/valblk.cpp +++ b/storage/connect/valblk.cpp @@ -592,7 +592,7 @@ void CHRBLK::SetValue(char *sp, uint len, int n) #endif if (sp) - memcpy(p, sp, Long); + memcpy(p, sp, min((unsigned)Long, len)); if (Blanks) { // Suppress eventual ending zero and right fill with blanks |