From 2aa304d37c1de25b3b18f4eee24a4874a9ce0f0f Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mysql.com>
Date: Mon, 27 Jan 2003 17:27:21 +0100
Subject: protection agains badly charsed indexfile

---
 myisam/mi_open.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'myisam/mi_open.c')

diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 250e0483fe5..4eb7376cdb6 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -329,7 +329,11 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
             {
               *pos=ft_keysegs[j];
               pos[0].language= pos[-1].language;
-              pos[0].charset= pos[-1].charset;
+              if (!(pos[0].charset= pos[-1].charset))
+              {
+                my_errno=HA_ERR_CRASHED;
+                goto err;
+              }
               pos++;
             }
           }
-- 
cgit v1.2.1