[svn-r6047] Purpose:

    Bug fix & code cleanup

Description:
    Hyperslab code for collapsing dimensions was incorrectly collapsing
    selections inappropriately when the fastest changing dimension couldn't
    be collapsed.

    Also add some more assertions which will make similar bugs easier to find.

Solution:
    Break out of loop earlier.

Platforms tested:
    modi4 (parallel), too small to triple check.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/H5FL.c b/src/H5FL.c
index 7e002ad..917821c 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -1176,6 +1176,9 @@ H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, unsigned clear)
 
     /* Check if there is a maximum number of elements in array */
     if(head->maxelem>0) {
+        /* Sanity check that the number of elements is supported */
+        assert((int)elem<=head->maxelem);
+
         /* Check for nodes available on the free list first */
         if(head->u.list_arr[elem]!=NULL) {
             /* Get a pointer to the block on the free list */
@@ -1260,6 +1263,9 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void * obj, size_t new_elem)
     else {
         /* Check if there is a maximum number of elements in array */
         if(head->maxelem>0) {
+            /* Sanity check that the number of elements is supported */
+            assert((int)new_elem<=head->maxelem);
+
             /* Get the pointer to the info header in front of the block to free */
             temp=(H5FL_arr_node_t *)((unsigned char *)obj-sizeof(H5FL_arr_node_t));