Merge pull request mandiant#33 from fireeye/fix/potential-inf-loop

Updated log level and fix for potential infinite loop.

Author: jtbennett-fe

flare_emu.py

@@ -446,7 +446,15 @@ def iterate(self, target, targetCallback, preEmuCallback=None, callHook=None, in
         # read targets from dict to go from higher to lower addresses
         # this is done to optimize loop by allowing hook to check for and remove other targets visited en route to
         # current target
+        prev_target_info_len = len(userData["targetInfo"])
         while len(userData["targetInfo"]) > 0:
+            # Fixes potential edge-case for infinite loop where the target VAs are never reached
+            #  and the length never decreases. This modification verifies that the target VAs
+            #  are being deleted; otherwise, breaks out of the while loop.
+            if cnt > 1 and len(userData["targetInfo"]) == prev_target_info_len:
+                break
+            prev_target_info_len = len(userData["targetInfo"])
+
             userData["targetVA"] = targetVA = sorted(
                 userData["targetInfo"].keys(), reverse=True)[0]
             flow, paths = userData["targetInfo"][targetVA]