summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kaa@polly.local>2005-01-17 19:21:01 +0300
committerunknown <kaa@polly.local>2005-01-17 19:21:01 +0300
commit4fc1801d08b08dbb86f82cf83c11f5b90aaca745 (patch)
treea53cee255847a24057992306d10083ede898dc80
parente0cbfe76582ed85b13d291b3204ace57872b9f24 (diff)
downloadmariadb-git-4fc1801d08b08dbb86f82cf83c11f5b90aaca745.tar.gz
Fixed memory leak in handle_local_infile()
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--libmysql/libmysql.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index d6ab5ae3180..7ff770e8fbb 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -93,6 +93,7 @@ joerg@mysql.com
joreland@mysql.com
jorge@linux.jorge.mysql.com
jplindst@t41.(none)
+kaa@polly.local
kaj@work.mysql.com
kent@mysql.com
konstantin@mysql.com
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 10077e695f3..206fd8f77b4 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -852,6 +852,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename)
err:
/* free up memory allocated with _init, usually */
(*options->local_infile_end)(li_ptr);
+ my_free(buf, MYF(0));
DBUG_RETURN(result);
}