Merge branch 'LA.BF64.1.2.1_rb2.6' of git://codeaurora.org/platform/hardware/qcom/wlan into cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1

1 files changed, 9 insertions, 7 deletions

diff --git a/qcwcn/wifi_hal/gscan_event_handler.cpp b/qcwcn/wifi_hal/gscan_event_handler.cpp
index 168a82f..6d78219 100644
--- a/qcwcn/wifi_hal/gscan_event_handler.cpp
+++ b/qcwcn/wifi_hal/gscan_event_handler.cpp
@@ -1171,15 +1171,17 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             case QCA_NL80211_VENDOR_SUBCMD_GSCAN_SIGNIFICANT_CHANGE:
             {
-                for (i = 0; i < mSignificantChangeNumResults; i++)
-                {
-                    if (mSignificantChangeResults[i]) {
-                        free(mSignificantChangeResults[i]);
-                        mSignificantChangeResults[i] = NULL;
+                if (mSignificantChangeResults) {
+                    for (i = 0; i < mSignificantChangeNumResults; i++)
+                    {
+                        if (mSignificantChangeResults[i]) {
+                            free(mSignificantChangeResults[i]);
+                            mSignificantChangeResults[i] = NULL;
+                        }
                     }
+                    free(mSignificantChangeResults);
+                    mSignificantChangeResults = NULL;
                 }
-                free(mSignificantChangeResults);
-                mSignificantChangeResults = NULL;
                 mSignificantChangeNumResults = 0;
                 mSignificantChangeMoreData = false;
             }