diff options
| author | monty@mashka.mysql.fi <> | 2002-07-25 22:46:28 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-07-25 22:46:28 +0300 |
| commit | bc035c71f1d94649253e4dac5fb8e5c981c7d834 (patch) | |
| tree | f38c137c73206e3d059517b2bcab6a4a43c957f9 /innobase/mtr | |
| parent | b126501bf3888b09fad83dbd2894709c45f009fc (diff) | |
| parent | 3c9f1a9ae47e4fcbede526430b0171e8ba17d948 (diff) | |
| download | mariadb-git-bc035c71f1d94649253e4dac5fb8e5c981c7d834.tar.gz | |
Merge with 3.23.51
Fixed wrong usage of sprintf() in ha_innodb.cc
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 6aa1f3509d4..e9a6e39d98f 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); |