summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorJimmy Yang <jimmy.yang@oracle.com>2011-11-20 18:21:20 -0800
committerJimmy Yang <jimmy.yang@oracle.com>2011-11-20 18:21:20 -0800
commit771f0c61bb92b91b07a04c511870b6dcafaf4a73 (patch)
tree95c020a11093903d1ddd71b07e4c8a0993a093c3 /storage
parenteb4d3ef264e93e27397df6bcaf18ad6a546e918c (diff)
downloadmariadb-git-771f0c61bb92b91b07a04c511870b6dcafaf4a73.tar.gz
Fix Bug #13405367 - 60212 SERVER CRASH WITH CORRUPT FETCH BUFFER
rb://608 approved by Sunny Bains
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/row/row0mysql.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
index d06411e09f0..987d6595224 100644
--- a/storage/innobase/row/row0mysql.c
+++ b/storage/innobase/row/row0mysql.c
@@ -289,21 +289,21 @@ row_mysql_pad_col(
/* space=0x0020 */
pad_end = pad + len;
ut_a(!(len % 2));
- do {
+ while (pad < pad_end) {
*pad++ = 0x00;
*pad++ = 0x20;
- } while (pad < pad_end);
+ };
break;
case 4:
/* space=0x00000020 */
pad_end = pad + len;
ut_a(!(len % 4));
- do {
+ while (pad < pad_end) {
*pad++ = 0x00;
*pad++ = 0x00;
*pad++ = 0x00;
*pad++ = 0x20;
- } while (pad < pad_end);
+ }
break;
}
}