Merge lp:~vkolesnikov/pbxt/pbxt-bug-534361 into lp:pbxt

[Vladimir Kolesnikov]

[lp:~vkolesnikov/pbxt/pbxt-bug-534361]

798. By Vladimir Kolesnikov on 2010-03-16

Added Kristian's fix for buffer overrun

=== modified file 'ChangeLog'
--- ChangeLog	2010-03-08 11:43:47 +0000
+++ ChangeLog	2010-03-16 10:26:31 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.10i RC4 - Not released yet
 
+RN312: Fixed bug #534361: Valgrind error: write of uninitialised bytes in xt_flush_indices()
+
 RN311: Fixed ilog corruption when running out of disk space during an index flush operation, which lead to corruption of the index.
 
 ------- 1.0.10h RC4 - 2010-02-25

=== modified file 'src/myxt_xt.cc'
--- src/myxt_xt.cc	2010-03-02 17:36:27 +0000
+++ src/myxt_xt.cc	2010-03-16 10:26:31 +0000
@@ -255,6 +255,11 @@
 	xtWord1					*end;
 	xtWord1					*start;
 
+#ifdef HAVE_valgrind
+       if (ind->mi_fix_key)
+               memset((byte*) key, 0,(size_t) (ind->mi_key_size) );
+#endif
+
 	start = key;
  	for (u_int i=0; i<ind->mi_seg_count; i++, keyseg++)
 	{

=== modified file 'src/xactlog_xt.cc'
--- src/xactlog_xt.cc	2010-01-12 07:26:46 +0000
+++ src/xactlog_xt.cc	2010-03-16 10:26:31 +0000
@@ -1140,7 +1140,8 @@
 			part_size = 512 - part_size;
 			xl_write_buffer[xl_write_buf_pos] = XT_LOG_ENT_END_OF_LOG;
 #ifdef HAVE_valgrind
-			memset(xl_write_buffer + xl_write_buf_pos + 1, 0x66, part_size);
+			if (part_size > 1)
+				memset(xl_write_buffer + xl_write_buf_pos + 1, 0x66, part_size - 1);
 #endif
 			if (!xt_pwrite_file(xl_log_file, xl_write_log_offset, xl_write_buf_pos+part_size, xl_write_buffer, &thread->st_statistics.st_xlog, thread))
 				goto write_failed;