diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
| commit | 61ae92889808c3c38c5e449e36fc30f89e8e3f23 (patch) | |
| tree | 8cb3e4210dd5da0c3cec217f0e5008ee9104715b /client/mysqldump.c | |
| parent | f815246486444ca2dc5d408099439e1d973d3a7b (diff) | |
| parent | 06a1df91813ea2c39f7312bcf8af972c7e8a926f (diff) | |
| download | mariadb-git-61ae92889808c3c38c5e449e36fc30f89e8e3f23.tar.gz | |
Manual 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 e9e3124b9cb..56d6c12981f 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -808,7 +808,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); } @@ -4486,7 +4486,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) { |