commit b66d04b0a207046b59ae0b40a4c435c22e8786bf
author Greg Kaiser <gkaiser@google.com> Mon May 11 06:52:15 2020 -0700
committer Greg Kaiser <gkaiser@google.com> Mon May 11 13:53:59 2020 +0000
tree 8f6d0b693e00764811d3e582b6dc4fd8282271b0
parent 7bcb89317d296296c67b6da2d5a27ecebd9afe19

AChoreographer: Avoid potential NULL dereference

We move our nullptr check to before our dereference of the pointer.

Test: TreeHugger
Bug: 154874011
Change-Id: If1e51b8fb88f72b6b4cbda52543bf093e6c76ca9

libs/nativedisplay/AChoreographer.cpp

diff --git a/libs/nativedisplay/AChoreographer.cpp b/libs/nativedisplay/AChoreographer.cpp
index ea51245..e458b2e 100644
--- a/libs/nativedisplay/AChoreographer.cpp
+++ b/libs/nativedisplay/AChoreographer.cpp
@@ -250,12 +250,12 @@
     }
     if (needsRegistration) {
         JNIEnv* env = getJniEnv();
-        jobject dmg = env->CallStaticObjectMethod(gJni.displayManagerGlobal.clazz,
-                                                  gJni.displayManagerGlobal.getInstance);
         if (env == nullptr) {
-            ALOGW("JNI environment is unavailable, skipping registeration");
+            ALOGW("JNI environment is unavailable, skipping registration");
             return;
         }
+        jobject dmg = env->CallStaticObjectMethod(gJni.displayManagerGlobal.clazz,
+                                                  gJni.displayManagerGlobal.getInstance);
         if (dmg == nullptr) {
             ALOGW("DMS is not initialized yet: skipping registration");
             return;