InferenceError may be raised when running the next iteration, but we don't want it to propagate

2 files changed, 3 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 98d2226c6..e8f1da82e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog for PyLint
 
     * #87192 fix crash when decorators are accessed through more than one dot
       (for instance @a.b is fine, @a.b.c crash)
+    * fix potential crashes with utils.safe_infer raising InferenceError
 
 2011-12-08  --  0.25.1
     * #81078: Warn if names in  exception handlers clobber overwrite
diff --git a/checkers/utils.py b/checkers/utils.py
index 2883c43ba..95574d4ef 100644
--- a/checkers/utils.py
+++ b/checkers/utils.py
@@ -65,6 +65,8 @@ def safe_infer(node):
     try:
         inferit.next()
         return # None if there is ambiguity on the inferred node
+    except astng.InferenceError:
+        return # there is some kind of ambiguity
     except StopIteration:
         return value