diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-04-01 12:57:34 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-04-01 12:57:34 +0300 |
| commit | dccbde7a11fbfb9926924719fb8f9c07a9621e80 (patch) | |
| tree | 4e038a42f8eb9fe7e1ad4e581fac9e4421ae880a /storage | |
| parent | a26f8d91aa400f60fcabaab6c243956a0d9419fd (diff) | |
| parent | 22f240348d48f4ca0746b9570ee2c19b6086af5b (diff) | |
| download | mariadb-git-dccbde7a11fbfb9926924719fb8f9c07a9621e80.tar.gz | |
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/archive/ha_archive.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index d20ab3bf723..5e2a4ad5da3 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1071,7 +1071,11 @@ int ha_archive::unpack_row(azio_stream *file_to_read, uchar *record) row_len= uint4korr(size_buffer); DBUG_PRINT("ha_archive",("Unpack row length %u -> %u", row_len, (unsigned int)table->s->reclength)); - fix_rec_buff(row_len); + + if (fix_rec_buff(row_len)) + { + DBUG_RETURN(HA_ERR_OUT_OF_MEM); + } DBUG_ASSERT(row_len <= record_buffer->length); read= azread(file_to_read, record_buffer->buffer, row_len, &error); |