diff options
| author | Naresh Jayaram <njayar@codeaurora.org> | 2015-02-19 15:52:30 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-03 18:23:36 -0800 |
| commit | a03b7f5ae8988d708c5287442e96d1d5297dc506 (patch) | |
| tree | ca53dde78551db385f54980ecd3d44918e6def85 | |
| parent | 03a5cfb7363e3e2fa5c0585faf9509a170208dcc (diff) | |
| download | android_hardware_qcom_wlan-a03b7f5ae8988d708c5287442e96d1d5297dc506.tar.gz android_hardware_qcom_wlan-a03b7f5ae8988d708c5287442e96d1d5297dc506.tar.bz2 android_hardware_qcom_wlan-a03b7f5ae8988d708c5287442e96d1d5297dc506.zip | |
wifihal: Handle Null Pointer dereference.
Avoid dereferencing the pointer before the NULL check.
Change-Id: I9e28d67808bdb7e6d3ed2b7999a287cb799e81e6
CRs-Fixed: 797450
| -rw-r--r-- | qcwcn/wifi_hal/gscan_event_handler.cpp | 16 |
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; } |