diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 00:10:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 00:10:40 +0100 |
| commit | 162399515813a4e23c8735473f9d2dd622a6679b (patch) | |
| tree | 39077fdabea60983c59899ce3d28e84c4d97c7e6 /libmysql | |
| parent | 5908d7ebb81bc2d52c67e519a4643372cb9f08bd (diff) | |
| parent | 0ed474484c037a32bea32abaecd3ff770f40bd49 (diff) | |
| download | mariadb-git-162399515813a4e23c8735473f9d2dd622a6679b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/conf_to_src.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c index a5a7d23db0b..0e92388c93c 100644 --- a/libmysql/conf_to_src.c +++ b/libmysql/conf_to_src.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -118,7 +118,7 @@ print_arrays_for(char *set) { FILE *f; - sprintf(buf, "%s.conf", set); + snprintf(buf, sizeof(buf), "%s.conf", set); if ((f = fopen(buf, "r")) == NULL) { fprintf(stderr, "%s: can't read conf file for charset %s\n", prog, set); |