opal/datatype: attempt to fix the better fix :-)

Signed-off-by: Gilles Gouaillardet <[email protected]>

Author: ggouaillardet

opal/datatype/opal_convertor_raw.c

@@ -172,16 +172,7 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
             if( pElem->loop.common.flags & OPAL_DATATYPE_FLAG_CONTIGUOUS ) {
                 ptrdiff_t offset = end_loop->first_elem_disp;
                 source_base += offset;
-                for(size_t i = count_desc; i > 0; i--, index++ ) {
-                    if (index >= *iov_count) {
-                        dt_elem_desc_t* nElem = pElem + 1;
-                        while (nElem->elem.common.type == OPAL_DATATYPE_LOOP) {
-                            nElem++;
-                        }
-                        assert(OPAL_DATATYPE_END_LOOP != nElem->elem.common.type);
-                        offset = nElem->elem.disp;
-                        break;
-                    }
+                for(size_t i = MIN(count_desc, *iov_count - index); i > 0; i--, index++ ) {
                     OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, end_loop->size, pConvertor->pBaseBuf,
                                                 pConvertor->pDesc, pConvertor->count );
                     iov[index].iov_base = (IOVBASE_TYPE *) source_base;