Merge "Fix a nullptr use before check in EAS_Shutdown"
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)