From ca2d988a47c006a0bf67e1b5863074e2dcd36216 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Mon, 29 Dec 2014 15:24:13 +0100
Subject: [PATCH] SSR: prevent NPE (EA-62397 - NPE:
 MatcherImpl.processMatchesInElement)

---
 .../intellij/structuralsearch/impl/matcher/MatcherImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java
index e36b705cf8ce..92b6568c28c0 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java
@@ -145,7 +145,10 @@ public class MatcherImpl {
       visitor.matchContext(matchedNodes);
     } finally {
       matchedNodes.reset();
-      matchContext.getOptions().setScope(null);
+      final MatchOptions options = matchContext.getOptions();
+      if (options != null) {
+        options.setScope(null);
+      }
     }
   }