diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2013-01-07 16:19:06 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2013-01-07 16:19:06 +0530 |
| commit | 9a1dd17978a4dfdb7a6840f5b97e41456b8be773 (patch) | |
| tree | f1fe7a858a267f79746f52931c9c26a89b9e4e28 /mysys | |
| parent | a14009a0ae50565e5e8826065b6efc92c51bb08d (diff) | |
| parent | b53881c4de85e104eb73ff34befb9b0ebc9b0f44 (diff) | |
| download | mariadb-git-9a1dd17978a4dfdb7a6840f5b97e41456b8be773.tar.gz | |
Merge of patch for Bug#16066243 from mysql-5.1.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_pack.c | 9 | ||||
| -rw-r--r-- | mysys/my_lib.c | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index 18c9a38f0db..7f844db5b9d 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, 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 @@ -11,7 +11,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ #include "mysys_priv.h" #include <m_string.h> @@ -451,10 +452,10 @@ char *intern_filename(char *to, const char *from) char buff[FN_REFLEN]; if (from == to) { /* Dirname may destroy from */ - strmov(buff,from); + (void) strnmov(buff, from, FN_REFLEN); from=buff; } length= dirname_part(to, from, &to_length); /* Copy dirname & fix chars */ - (void) strmov(to + to_length,from+length); + (void) strnmov(to + to_length, from + length, FN_REFLEN - to_length); return (to); } /* intern_filename */ diff --git a/mysys/my_lib.c b/mysys/my_lib.c index f178d75734a..71969f23d85 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, 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 @@ -11,7 +11,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ /* TODO: check for overun of memory for names. */ |