From cb4775c328e0a4af69aaf69e2dae1deeef28fffb Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Thu, 10 Nov 2011 22:18:42 +0000
Subject: [PATCH] Fix memory leak

---
 source/loaddata.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/loaddata.pas b/source/loaddata.pas
index e4218917..eebdf802 100644
--- a/source/loaddata.pas
+++ b/source/loaddata.pas
@@ -171,9 +171,9 @@ begin
     v := FConnection.ServerVersionInt;
     if ((v >= 50038) and (v < 50100)) or (v >= 50117) then begin
       Charset := MainForm.GetCharsetByEncoding(Encoding);
-      // Detect db charset
-      DefCharset := 'Let server/database decide';
       try
+        // Detect db charset
+        DefCharset := 'Let server/database decide';
         dbcreate := FConnection.GetVar('SHOW CREATE DATABASE '+FConnection.QuoteIdent(comboDatabase.Text), 1);
         rx := TRegExpr.Create;
         rx.ModifierG := True;
@@ -181,6 +181,7 @@ begin
         if rx.Exec(dbcreate) then
           DefCharset := DefCharset + ' ('+rx.Match[1]+')';
         comboEncoding.Items.Add(DefCharset);
+        rx.Free;
       except
         // Supress error dialog when user does not have privs for above SHOW query
         // see http://www.heidisql.com/forum.php?t=8862