Skip to content

events: add null check for the signal of EventTarget #43153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 7 commits into from
Oct 13, 2022
Merged

events: add null check for the signal of EventTarget #43153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21cb08f
events: add null check for the signal of EventTarget
shisama May 19, 2022
5c5f40a
fix lint errors
shisama May 20, 2022
4d76ce3
fix trailing comma
shisama May 20, 2022
a10f689
fix error message in test
shisama May 20, 2022
8607445
fix touse validateAbortSignal to check signal
shisama May 21, 2022
2fae6f2
Update test/parallel/test-eventtarget-whatwg-signal.js
shisama May 21, 2022
8c29e22
Update WPT events test
shisama Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
events: add null check for the signal of EventTarget 
This will improve the Web compatibility.
Passing null as the signal should throw an error.
WPT says "Passing null as the signal should throw".
Please see https://github.com/web-platform-tests/wpt/blob/master/dom/events/AddEventListenerOptions-signal.any.js
  • Loading branch information
@shisama
shisama committed Oct 11, 2022
commit 21cb08f95d35d9ef72e1df0fd0b3f618b90aa3ea
4 changes: 4 additions & 0 deletions lib/internal/event_target.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,10 @@ class EventTarget {
}
type = String(type);

if (signal === null) {
Comment thread
aduh95 marked this conversation as resolved.
Outdated
throw new ERR_INVALID_ARG_TYPE('options.signal', 'AbortSignal', signal);
}

if (signal) {
if (signal.aborted) {
return;
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-whatwg-events-add-event-listener-options-signal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ require('../common');

const {
strictEqual,
throws
} = require('assert');

// Manually ported from: wpt@dom/events/AddEventListenerOptions-signal.any.js
Expand Down Expand Up @@ -157,3 +158,7 @@ const {
}, { once: true });
et.dispatchEvent(new Event('foo'));
}
{
const et = new EventTarget();
throws(() => et.addEventListener('foo', () => {}, {signal: null}));
}