Skip to content

Commit

Permalink
Merge pull request #257 from cloudflare/jsnell/clear-url-maybe
Browse files Browse the repository at this point in the history
  • Loading branch information
jasnell authored Jan 10, 2023
2 parents 9f9e74c + 1a7c135 commit 20ea1e0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/workerd/api/url-standard.c++
Original file line number Diff line number Diff line change
Expand Up @@ -1633,6 +1633,12 @@ kj::Maybe<UrlRecord> URL::parse(
URL::URL(jsg::UsvStringPtr url, jsg::Optional<jsg::UsvStringPtr> base)
: inner(handleConstructorParse(url, kj::mv(base))) {}

URL::~URL() noexcept(false) {
KJ_IF_MAYBE(searchParams, maybeSearchParams) {
(*searchParams)->maybeUrl = nullptr;
}
}

jsg::UsvString URL::getOrigin() {
KJ_SWITCH_ONEOF(inner.getOrigin()) {
KJ_CASE_ONEOF(opaque, OpaqueOrigin) {
Expand Down
2 changes: 2 additions & 0 deletions src/workerd/api/url-standard.h
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ class URL: public jsg::Object {

URL(jsg::UsvStringPtr url, jsg::Optional<jsg::UsvStringPtr> base = nullptr);

~URL() noexcept(false) override;

static inline jsg::Ref<URL> constructor(
jsg::UsvString url,
jsg::Optional<jsg::UsvString> base) {
Expand Down

0 comments on commit 20ea1e0

Please sign in to comment.