summaryrefslogtreecommitdiffstats
path: root/src/H5Dcontig.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-01-26 21:26:12 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-01-26 21:26:12 (GMT)
commit8bbdc947c4f92fc9b1711adc0b00337dae2ed666 (patch)
tree4f5f3edadeece803b46ed1c3a84f11a7d266e9ec /src/H5Dcontig.c
parent8aa7c27fb717f481d924ea5f7793b10f35c29947 (diff)
downloadhdf5-8bbdc947c4f92fc9b1711adc0b00337dae2ed666.zip
hdf5-8bbdc947c4f92fc9b1711adc0b00337dae2ed666.tar.gz
hdf5-8bbdc947c4f92fc9b1711adc0b00337dae2ed666.tar.bz2
[svn-r28972] Removed option to clear file buffers from autotools, CMake, and library.
Buffers that will be written to disk will now always be cleared since not doing this has huge security implications. Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0, x86_64) gcc 5.2.1 serial autotools parallel autotools (MPICH 3.1.4) serial CMake
Diffstat (limited to 'src/H5Dcontig.c')
-rw-r--r--src/H5Dcontig.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 3edf8b2..484514f 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -1026,10 +1026,9 @@ H5D__contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
if(NULL == (dset_contig->sieve_buf = H5FL_BLK_CALLOC(sieve_buf, dset_contig->sieve_buf_size)))
HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "memory allocation failed")
-#ifdef H5_CLEAR_MEMORY
-if(dset_contig->sieve_size > len)
- HDmemset(dset_contig->sieve_buf + len, 0, (dset_contig->sieve_size - len));
-#endif /* H5_CLEAR_MEMORY */
+ /* Clear memory */
+ if(dset_contig->sieve_size > len)
+ HDmemset(dset_contig->sieve_buf + len, 0, (dset_contig->sieve_size - len));
/* Determine the new sieve buffer size & location */
dset_contig->sieve_loc = addr;