database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE

Browse Source 
Merging from mysql-5.1 to mysql-5.5
This commit is contained in:
Venkata Sidagam
2013-10-16 14:16:32 +05:30
parent 4522a8704f de0e8a02d1
commit e84d48742e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_acl.cc
View File

@@ -1588,7 +1588,8 @@ ulong acl_get(const char *host, const char *ip,
copy_length= (size_t) (strlen(ip ? ip : "") +
strlen(user ? user : "") +
strlen(db ? db : ""));
strlen(db ? db : "")) + 2; /* Added 2 at the end to avoid
buffer overflow at strmov()*/
/*
Make sure that strmov() operations do not result in buffer overflow.
*/
@@ -4957,7 +4958,8 @@ bool check_grant_db(THD *thd,const char *db)
size_t copy_length;
copy_length= (size_t) (strlen(sctx->priv_user ? sctx->priv_user : "") +
strlen(db ? db : ""));
strlen(db ? db : "")) + 1; /* Added 1 at the end to avoid
buffer overflow at strmov()*/
/*
Make sure that strmov() operations do not result in buffer overflow.