summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@koziol.gov>2019-03-19 21:20:54 (GMT)
committerQuincey Koziol <koziol@koziol.gov>2019-03-19 21:20:54 (GMT)
commit93b72d60ab9c99898e40ecd03b0d5d3fb3830931 (patch)
tree3200003c54f976daafb651542f5df5d5e43a40f3
parentcda6273737eda85398a110e9df73b67dc30722ab (diff)
parent604b67df19a164824b74fba0aa5e489b5a64d1ae (diff)
downloadhdf5-93b72d60ab9c99898e40ecd03b0d5d3fb3830931.zip
hdf5-93b72d60ab9c99898e40ecd03b0d5d3fb3830931.tar.gz
hdf5-93b72d60ab9c99898e40ecd03b0d5d3fb3830931.tar.bz2
Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01
-rw-r--r--src/H5MM.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/H5MM.c b/src/H5MM.c
index 6f65e06..1a5a149 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -589,8 +589,12 @@ H5MM_memcpy(void *dest, const void *src, size_t n)
HDassert(dest);
HDassert(src);
- HDassert(n > 0);
+#if 0
+ /* Commented out while we investigate overlapping buffers in the
+ * parallel filter code (HDFFV-10735).
+ */
HDassert((char *)dest >= (const char *)src + n || (const char *)src >= (char *)dest + n);
+#endif
ret = HDmemcpy(dest, src, n);