mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: crash on getUserMedia with invalid chromeMediaSourceId (#45755)

Browse source 
* fix: crash on getUserMedia with invalid chromeMediaSourceId

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* test: add a test

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2025-02-21 22:19:03 +01:00 • committed by GitHub
parent 4cb9c44d97
commit 05b57a2f07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
shell/browser/web_contents_permission_helper.cc
View file

@ -101,16 +101,20 @@ void HandleUserMediaRequest(const content::MediaStreamRequest& request,
: ""); : "");
} }
if (request.video_type == MediaStreamType::GUM_TAB_VIDEO_CAPTURE || if (request.video_type == MediaStreamType::GUM_TAB_VIDEO_CAPTURE) {
request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) { devices_ref.video_device =
blink::MediaStreamDevice(request.video_type, "", "");
} else if (request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) {
// If the DesktopMediaID can't be successfully parsed, throw an
// Invalid state error to match upstream.
auto dm_id = GetScreenId(request.requested_video_device_ids);
if (dm_id.is_null()) {
std::move(callback).Run(blink::mojom::StreamDevicesSet(),
MediaStreamRequestResult::INVALID_STATE, nullptr);
return;
}
devices_ref.video_device = blink::MediaStreamDevice( devices_ref.video_device = blink::MediaStreamDevice(
request.video_type, request.video_type, dm_id.ToString(), "Screen");
request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE
? GetScreenId(request.requested_video_device_ids).ToString()
: "",
request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE
? "Screen"
: "");
} }
bool empty = !devices_ref.audio_device.has_value() && bool empty = !devices_ref.audio_device.has_value() &&

17
spec/api-media-handler-spec.ts
View file

@ -400,6 +400,23 @@ describe('setDisplayMediaRequestHandler', () => {
expect(ok).to.be.true(message); expect(ok).to.be.true(message);
}); });
it('throws an error when calling legacy getUserMedia with invalid chromeMediaSourceId', async () => {
const w = new BrowserWindow({ show: false });
await w.loadURL(serverUrl);
const { ok, message } = await w.webContents.executeJavaScript(`
new Promise((resolve, reject) => navigator.getUserMedia({
video: {
mandatory: {
chromeMediaSource: 'desktop',
chromeMediaSourceId: undefined,
},
},
}, x => resolve({ok: x instanceof MediaStream}), e => resolve({ ok: false, message: e.message })))
`);
expect(ok).to.be.false();
expect(message).to.equal('Invalid state');
});
it('can remove a displayMediaRequestHandler', async () => { it('can remove a displayMediaRequestHandler', async () => {
const ses = session.fromPartition('' + Math.random()); const ses = session.fromPartition('' + Math.random());