diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:56:13 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:56:13 +0300 |
| commit | 0ae23cd69d3c13dba2a73750e93abf3342f21eb4 (patch) | |
| tree | 27d736b66dbef96f0119023bc78b639f7a59faaa /client/mysqldump.c | |
| parent | 6e9dad7e67e377ce14bc528c614d6ff7491235d0 (diff) | |
| parent | f6a8efbea3f8572c72066343b58ba88e679edc2c (diff) | |
| download | mariadb-git-0ae23cd69d3c13dba2a73750e93abf3342f21eb4.tar.gz | |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 9c665e6d76a..c50f2de5e7d 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -840,7 +840,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), &err_ptr, &err_len); if (err_len) { - strmake(buff, err_ptr, min(sizeof(buff), err_len)); + strmake(buff, err_ptr, min(sizeof(buff) - 1, err_len)); fprintf(stderr, "Invalid mode to --compatible: %s\n", buff); exit(1); } @@ -4630,7 +4630,7 @@ static ulong find_set(TYPELIB *lib, const char *x, uint length, for (; pos != end && *pos != ','; pos++) ; var_len= (uint) (pos - start); - strmake(buff, start, min(sizeof(buff), var_len)); + strmake(buff, start, min(sizeof(buff) - 1, var_len)); find= find_type(buff, lib, var_len); if (!find) { |