On Fri, 2020-08-21 at 19:00 +0800, Zhiqiang Liu wrote: > In vector_foreach_slot_after macro, i is the input var, which > may have a illegal value (i < 0). So we should add lower boundary > check in vector_foreach_slot_after macro. > > V1->V2: > - check whether i is illegal before loop (As suggested by Martin) >
Reviewed-by: Martin Wilck <[email protected]> > Signed-off-by: Zhiqiang Liu <[email protected]> > Signed-off-by: lixiaokeng <[email protected]> > --- > libmultipath/vector.h | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/libmultipath/vector.h b/libmultipath/vector.h > index 2862dc28..ab80d06e 100644 > --- a/libmultipath/vector.h > +++ b/libmultipath/vector.h > @@ -38,11 +38,12 @@ typedef struct _vector *vector; > #define VECTOR_LAST_SLOT(V) (((V) && VECTOR_SIZE(V) > 0) ? (V)- > >slot[(VECTOR_SIZE(V) - 1)] : NULL) > > #define vector_foreach_slot(v,p,i) \ > - for (i = 0; (v) && (int)i < VECTOR_SIZE(v) && ((p) = (v)- > >slot[i]); i++) > + for ((i) = 0; (v) && (int)(i) < VECTOR_SIZE(v) && ((p) = (v)- > >slot[i]); (i)++) > #define vector_foreach_slot_after(v,p,i) \ > - for (; (v) && (int)i < VECTOR_SIZE(v) && ((p) = (v)->slot[i]); > i++) > + if ((v) && (int)(i) >= 0) \ > + for (; (int)(i) < VECTOR_SIZE(v) && ((p) = (v)- > >slot[i]); (i)++) > #define vector_foreach_slot_backwards(v,p,i) \ > - for (i = VECTOR_SIZE(v) - 1; (int)i >= 0 && ((p) = (v)- > >slot[i]); i--) > + for ((i) = VECTOR_SIZE(v) - 1; (int)(i) >= 0 && ((p) = (v)- > >slot[i]); (i)--) > > #define identity(x) (x) > /* -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
