diff options
| author | heikki@hundin.mysql.fi <> | 2002-06-22 20:41:14 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2002-06-22 20:41:14 +0300 |
| commit | 128e872f3cc19ec59cb6e07dbb638732797b3f15 (patch) | |
| tree | cd94be28879d52101bd7438dc97dc04856d81739 /innobase/mtr | |
| parent | 8056af30e467350a3725c0324bd2142b8fd26801 (diff) | |
| download | mariadb-git-128e872f3cc19ec59cb6e07dbb638732797b3f15.tar.gz | |
Many files:
Merge 3.23.52
Diffstat (limited to 'innobase/mtr')
| -rw-r--r-- | innobase/mtr/mtr0log.c | 6 | ||||
| -rw-r--r-- | innobase/mtr/mtr0mtr.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/innobase/mtr/mtr0log.c b/innobase/mtr/mtr0log.c index 26f5a5d1cb7..b582afc5710 100644 --- a/innobase/mtr/mtr0log.c +++ b/innobase/mtr/mtr0log.c @@ -290,7 +290,7 @@ mlog_write_string( ut_a(0); } ut_ad(ptr && mtr); - ut_ad(len < UNIV_PAGE_SIZE); + ut_a(len < UNIV_PAGE_SIZE); ut_memcpy(ptr, str, len); @@ -338,9 +338,13 @@ mlog_parse_string( offset = mach_read_from_2(ptr); ptr += 2; + ut_a(offset < UNIV_PAGE_SIZE); + len = mach_read_from_2(ptr); ptr += 2; + ut_a(len + offset < UNIV_PAGE_SIZE); + if (end_ptr < ptr + len) { return(NULL); diff --git a/innobase/mtr/mtr0mtr.c b/innobase/mtr/mtr0mtr.c index f38aa6793b9..565489613ae 100644 --- a/innobase/mtr/mtr0mtr.c +++ b/innobase/mtr/mtr0mtr.c @@ -315,7 +315,7 @@ mtr_log_reserve_and_write( } data_size = dyn_array_get_data_size(mlog); - + /* Open the database log for log_write_low */ mtr->start_lsn = log_reserve_and_open(data_size); |