commit 95ad2973de15846e1f67c5c5c30eae877afb2ca4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 13 14:29:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 13 14:29:40 2017 +0000
tree 00a550e743d7a10c890b60abdb94e43f9731bf86
parent ecde8c8a49ed1c3f1905ae0bf9d9eb4787faa351
parent 6040cfac9663e59c041ed4dee4dec682ae55b1f5

Merge "Fix a nullptr use before check in EAS_Shutdown"

arm-wt-22k/lib_src/eas_public.c

diff --git a/arm-wt-22k/lib_src/eas_public.c b/arm-wt-22k/lib_src/eas_public.c
index 51ac423..240a422 100644
--- a/arm-wt-22k/lib_src/eas_public.c
+++ b/arm-wt-22k/lib_src/eas_public.c
@@ -465,19 +465,18 @@
 */
 EAS_PUBLIC EAS_RESULT EAS_Shutdown (EAS_DATA_HANDLE pEASData)
 {
-    EAS_HW_DATA_HANDLE hwInstData;
-    EAS_RESULT result, reportResult;
-    EAS_INT i;
-
-    /* establish pointers */
-    hwInstData = pEASData->hwInstData;
-
     /* check for NULL handle */
     if (!pEASData)
         return EAS_ERROR_HANDLE_INTEGRITY;
 
+    /* establish pointers */
+    EAS_HW_DATA_HANDLE hwInstData = pEASData->hwInstData;
+
     /* if there are streams open, close them */
-    reportResult = EAS_SUCCESS;
+    EAS_RESULT reportResult = EAS_SUCCESS;
+
+    EAS_RESULT result;
+    EAS_INT i;
     for (i = 0; i < MAX_NUMBER_STREAMS; i++)
     {
         if (pEASData->streams[i].pParserModule && pEASData->streams[i].handle)