summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2009-05-17 05:57:08 +0000
committercyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2009-05-17 05:57:08 +0000
commite46b0f0ccdff21c05183af4e1555d5bee228b184 (patch)
treea1cc446055a7454d9c0f15b51236f49687757e72
parent572d1a94bd978395d24c628a8c7e4a4eb5cf7f1e (diff)
Change sizeof() to strlen() in db_mysql_secure(), patch by DukePyrolator.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2301 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/mysql.c2
-rw-r--r--version.log3
3 files changed, 4 insertions, 2 deletions
diff --git a/Changes b/Changes
index a0616815f..1df3bc642 100644
--- a/Changes
+++ b/Changes
@@ -39,6 +39,7 @@ Provided by mooncup <mooncup@anonnet.org> - 2009
Provided by DukePyrolator <> - 2009
03/15 F Log error when NSMemoReceipt isn't defined in config. [ #00]
03/22 F Fixed memleak in channels.c. [ #00]
+05/17 F Change sizeof() to strlen() in db_mysql_secure(). [ #00]
Provided by Szymek <> - 2009
03/30 F Fix HS OFF to work in all cases on InspIRCd. [#1075]
diff --git a/src/mysql.c b/src/mysql.c
index 8f032f1b9..01cf0f6fe 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -250,7 +250,7 @@ char *db_mysql_secure(char *pass, int size)
{
char tmp_pass[PASSMAX];
char *str, *tmp;
- unsigned bufsize = (2 * PASSMAX + 15 + sizeof(MysqlSecure));
+ unsigned bufsize = (2 * PASSMAX + 15 + strlen(MysqlSecure));
/* Initialize the buffer. Bug #86 */
memset(tmp_pass, 0, PASSMAX);
diff --git a/version.log b/version.log
index 793234b71..bfbdfc199 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,11 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="0"
VERSION_EXTRA="-svn"
-VERSION_BUILD="2299"
+VERSION_BUILD="2301"
# $Log$ # Changes since 1.8.0 Release
+#Revision 2301 - Change sizeof() to strlen() in db_mysql_secure(), patch by DukePyrolator.
#Revision 2299 - Fix bug #1078, MySQL query should no longer fail when password and salt are too long, patch from Adam.
#Revision 2297 - Patch to allow jupe on all bar uplink and self. Thanks Adam. (Bug #1076)
#Revision 2294 - Fix link to Link Block Generator on our site. Good find whoever it was :)