Skip to content

Legacy EME generateKeyRequest returns a bogus destination URL due to leftover debug scaffolding - #70082

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
cdumez:320147_legacyEME_url
Jul 27, 2026
Merged

Legacy EME generateKeyRequest returns a bogus destination URL due to leftover debug scaffolding#70082
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
cdumez:320147_legacyEME_url

Conversation

@cdumez

@cdumez cdumez commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

116a737

Legacy EME generateKeyRequest returns a bogus destination URL due to leftover debug scaffolding
https://bugs.webkit.org/show_bug.cgi?id=320147

Reviewed by Jean-Yves Avenard.

RemoteLegacyCDMSessionProxy::generateKeyRequest() calls into the CDM's
generateKeyRequest(), which fills the destinationURL out-parameter with
the real key-request destination. However, a leftover test string
("this is a test string") unconditionally overwrote destinationURL
before it was passed back to the WebProcess via the completion handler.
This debug scaffolding has been present since the original 2020
implementation (221729@main). Remove it so the real destination URL
is returned.

* Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.cpp:
(WebKit::RemoteLegacyCDMSessionProxy::generateKeyRequest): Remove the
leftover test-string assignment that clobbered the destinationURL
out-parameter.

Canonical link: https://commits.webkit.org/317970@main

8a99b27

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe 🛠 win ✅ 🛠 ios-apple
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 🧪 win-tests ✅ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe ✅ 🛠 vision-apple
✅ 🧪 ios-wk2-wpt ✅ 🧪 api-mac-debug ⏳ 🧪 jsc-wpe
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk3-libwebrtc
✅ 🛠 ios-safer-cpp ✅ 🧪 mac-AS-debug-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 gtk-wk2
✅ 🛠 🧪 merge ✅ 🛠 vision-sim ✅ 🧪 mac-intel-wk2 ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🛠 mac-safer-cpp ✅ 🛠 playstation
✅ 🛠 tv ✅ 🧪 mac-site-isolation
✅ 🛠 tv-sim
loading 🛠 watch
✅ 🛠 watch-sim

@cdumez cdumez self-assigned this Jul 24, 2026
@cdumez cdumez added the Media Bugs related to the HTML 5 Media elements. label Jul 24, 2026

@jyavenard jyavenard left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol

@cdumez cdumez added the merge-queue Applied to send a pull request to merge-queue label Jul 27, 2026
…leftover debug scaffolding

https://bugs.webkit.org/show_bug.cgi?id=320147

Reviewed by Jean-Yves Avenard.

RemoteLegacyCDMSessionProxy::generateKeyRequest() calls into the CDM's
generateKeyRequest(), which fills the destinationURL out-parameter with
the real key-request destination. However, a leftover test string
("this is a test string") unconditionally overwrote destinationURL
before it was passed back to the WebProcess via the completion handler.
This debug scaffolding has been present since the original 2020
implementation (221729@main). Remove it so the real destination URL
is returned.

* Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.cpp:
(WebKit::RemoteLegacyCDMSessionProxy::generateKeyRequest): Remove the
leftover test-string assignment that clobbered the destinationURL
out-parameter.

Canonical link: https://commits.webkit.org/317970@main
@webkit-commit-queue

Copy link
Copy Markdown
Collaborator

Committed 317970@main (116a737): https://commits.webkit.org/317970@main

Reviewed commits have been landed. Closing PR #70082 and removing active labels.

@webkit-commit-queue
webkit-commit-queue merged commit 116a737 into WebKit:main Jul 27, 2026
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jul 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Media Bugs related to the HTML 5 Media elements.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants