From 88012698db7988beba4ad39be5d68362c9f0d92c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 4 Jul 2002 12:25:13 +0200 Subject: [PATCH] do not crash on myrg_rprev/myrg_rnext if no current table (as when previous myrg_rkey failed, e.g. found nothing) --- myisammrg/myrg_rnext.c | 3 +++ myisammrg/myrg_rprev.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/myisammrg/myrg_rnext.c b/myisammrg/myrg_rnext.c index 5a3fbdfb299..703ca29632b 100644 --- a/myisammrg/myrg_rnext.c +++ b/myisammrg/myrg_rnext.c @@ -25,6 +25,9 @@ int myrg_rnext(MYRG_INFO *info, byte *buf, int inx) int err; MI_INFO *mi; + if (!info->current_table) + return (HA_ERR_KEY_NOT_FOUND); + /* at first, do rnext for the table found before */ if ((err=mi_rnext(info->current_table->table,NULL,inx))) { diff --git a/myisammrg/myrg_rprev.c b/myisammrg/myrg_rprev.c index d8089e80498..8c43b40035a 100644 --- a/myisammrg/myrg_rprev.c +++ b/myisammrg/myrg_rprev.c @@ -25,6 +25,9 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx) int err; MI_INFO *mi; + if (!info->current_table) + return (HA_ERR_KEY_NOT_FOUND); + /* at first, do rprev for the table found before */ if ((err=mi_rprev(info->current_table->table,NULL,inx))) {