admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly const-qualify return value of IceControllerInterface::connections().

Browse Source 
This is intended to be a read-only view across a container of const
Connection*, but due to the missing const, elements of the container
could actually be re-assigned through the ArrayView.

This was discovered when trying to roll Googletest, since Googletest was
fixed to const-qualify converting actions:
cbca6bc395

Bug: chromium:1409870
Change-Id: Iadd3abe6807111987e422b8510a23f2a4f7026ed
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/329481
Auto-Submit: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#41300}
This commit is contained in:
Daniel Cheng 2023-12-02 14:16:59 -08:00 committed by WebRTC LUCI CQ
parent 8f530e8d78
commit ad631f0d35
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
p2p/base/basic_ice_controller.h
View File

@ -32,10 +32,8 @@ class BasicIceController : public IceControllerInterface {
void SetSelectedConnection(const Connection* selected_connection) override;
void AddConnection(const Connection* connection) override;
void OnConnectionDestroyed(const Connection* connection) override;
rtc::ArrayView<const Connection*> connections() const override {
return rtc::ArrayView<const Connection*>(
const_cast<const Connection**>(connections_.data()),
connections_.size());
rtc::ArrayView<const Connection* const> connections() const override {
return connections_;
}
bool HasPingableConnection() const override;

2
p2p/base/ice_controller_interface.h
View File

@ -101,7 +101,7 @@ class IceControllerInterface {
virtual void OnConnectionDestroyed(const Connection* connection) = 0;
// These are all connections that has been added and not destroyed.
virtual rtc::ArrayView<const Connection*> connections() const = 0;
virtual rtc::ArrayView<const Connection* const> connections() const = 0;
// Is there a pingable connection ?
// This function is used to boot-strap pinging, after this returns true

2
p2p/base/mock_ice_controller.h
View File

@ -35,7 +35,7 @@ class MockIceController : public cricket::IceControllerInterface {
OnConnectionDestroyed,
(const cricket::Connection*),
(override));
MOCK_METHOD(rtc::ArrayView<const cricket::Connection*>,
MOCK_METHOD(rtc::ArrayView<const cricket::Connection* const>,
connections,
(),
(const, override));