Simplify the logic deciding when we're finished

2014-01-08 14:22:44 -06:00 · 2014-01-08 14:22:44 -06:00 · 4ba0020934
parent cc51c2033e
commit 4ba0020934
1 changed files with 4 additions and 3 deletions
--- a/lib/rex/socket/range_walker.rb
+++ b/lib/rex/socket/range_walker.rb
@ -193,10 +193,11 @@ class RangeWalker
  def next_ip
    return false if not valid?
    if (@curr_addr > @ranges[@curr_range].stop)
-      if (@curr_range >= @ranges.length - 1)
-        return nil
-      end
      @curr_range += 1
+
+      # Are we finished?
+      return nil if (@curr_range >= @ranges.length)
+
      @curr_addr = @ranges[@curr_range].start
    end
    addr = Rex::Socket.addr_itoa(@curr_addr, @ranges[@curr_range].ipv6?)