From 1a0acf3208ad5ed044744823aaa07b3758598a29 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 18 May 2016 19:31:15 +0300 Subject: [PATCH] Fix EA-82166. NPE. loadModel() can return null, and it's a bad idea to call methods on a null pointer. (cherry picked from commit cf033d0) (cherry picked from commit 37dc0ae) --- .../jetbrains/android/inspections/klint/AndroidModelFacade.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidModelFacade.kt b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidModelFacade.kt index 0ce449157a0..a60f967d545 100644 --- a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidModelFacade.kt +++ b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidModelFacade.kt @@ -50,6 +50,8 @@ class AndroidModelFacade(val facet: AndroidFacet) { ?.call(facet) } + val model = model ?: return null + return modelClass?.kotlin?.memberFunctions ?.firstOrNull { it.name == methodName } ?.call(model)