# HG changeset patch # User Bruno Haible # Date 1295863518 -3600 # Node ID af4da95a33d1a494332c848d5fcf9a8e94beb996 # Parent 3d689d237677279cd0a19372d3d757ab9c8d78d3 vma-iter: Avoid empty intervals. * lib/vma-iter.c (vma_iterate) [IRIX, OSF/1]: Don't call the callback on an empty interval. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-24 Bruno Haible + + vma-iter: Avoid empty intervals. + * lib/vma-iter.c (vma_iterate) [IRIX, OSF/1]: Don't call the callback + on an empty interval. + 2011-01-24 Jim Meyering u64: remove unnecessary #include diff --git a/lib/vma-iter.c b/lib/vma-iter.c --- a/lib/vma-iter.c +++ b/lib/vma-iter.c @@ -331,10 +331,12 @@ { /* Consider [start,end-1] \ [auxmap_start,auxmap_end-1] = [start,auxmap_start-1] u [auxmap_end,end-1]. */ - if (callback (data, start, auxmap_start, flags)) - break; - if (callback (data, auxmap_end, end, flags)) - break; + if (start < auxmap_start) + if (callback (data, start, auxmap_start, flags)) + break; + if (auxmap_end - 1 < end - 1) + if (callback (data, auxmap_end, end, flags)) + break; } else {