diff options
| author | George Burgess IV <gbiv@google.com> | 2021-01-20 21:14:13 -0800 |
|---|---|---|
| committer | Les Lee <lesl@google.com> | 2021-01-27 11:48:40 +0000 |
| commit | 2c0a47db87985c5610df088b19d1362d54aeb2c2 (patch) | |
| tree | 520871c29ba9572a5bb429bd0a1894489f99b599 /wifi/1.5/default/wifi_chip.cpp | |
| parent | 3e44dd3fb293eeab68bad0daf5bd9e4d40c0cdf5 (diff) | |
wifi: fix a use of an uninitialized value
This `if` is executed once, so using `legacy_status` from a prior
execution is nonsensical.
Caught by the static analyzer:
> hardware/interfaces/wifi/1.5/default/wifi_chip.cpp:1053:39: warning:
1st function call argument is an uninitialized value
[clang-analyzer-core.CallAndMessage]
Bug: 173999527
Test: atest -c VtsHalWifiApV1_5TargetTest
Merged-In: Ib81f1496be53e453d9c99ede129a77bdaf860de7
Change-Id: Ib81f1496be53e453d9c99ede129a77bdaf860de7
Diffstat (limited to 'wifi/1.5/default/wifi_chip.cpp')
| -rw-r--r-- | wifi/1.5/default/wifi_chip.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wifi/1.5/default/wifi_chip.cpp b/wifi/1.5/default/wifi_chip.cpp index fbb4a52bd9..414d74c088 100644 --- a/wifi/1.5/default/wifi_chip.cpp +++ b/wifi/1.5/default/wifi_chip.cpp @@ -1036,7 +1036,6 @@ WifiStatus WifiChip::removeApIfaceInternal(const std::string& ifname) { WifiStatus WifiChip::removeIfaceInstanceFromBridgedApIfaceInternal( const std::string& ifname, const std::string& ifInstanceName) { - legacy_hal::wifi_error legacy_status; const auto iface = findUsingName(ap_ifaces_, ifname); if (!iface.get() || ifInstanceName.empty()) { return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS); @@ -1048,13 +1047,13 @@ WifiStatus WifiChip::removeIfaceInstanceFromBridgedApIfaceInternal( if (iface == ifInstanceName) { if (!iface_util_.lock()->removeIfaceFromBridge(it.first, iface)) { - LOG(ERROR) << "Failed to remove interface: " << iface - << " from " << ifname << ", error: " - << legacyErrorToString(legacy_status); + LOG(ERROR) + << "Failed to remove interface: " << ifInstanceName + << " from " << ifname; return createWifiStatus( WifiStatusCode::ERROR_NOT_AVAILABLE); } - legacy_status = + legacy_hal::wifi_error legacy_status = legacy_hal_.lock()->deleteVirtualInterface(iface); if (legacy_status != legacy_hal::WIFI_SUCCESS) { LOG(ERROR) << "Failed to del interface: " << iface |