fix asan error due to search params destructor

cloudflare · Nov 25, 2024 · 70aead5 · 70aead5
1 parent 694e3c3
commit 70aead5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/workerd/api/url-standard.c++ b/src/workerd/api/url-standard.c++
@@ -225,7 +225,7 @@ void URLSearchParams::update() {
 void URLSearchParams::reset() {
   KJ_IF_SOME(url, maybeUrl) {
     auto search = kj::Maybe(url.inner.getSearch());
-    inner = initFromSearch(search);
+    inner.reset(search);
   }
 }
 

diff --git a/src/workerd/api/wpt/url-test.js b/src/workerd/api/wpt/url-test.js
@@ -128,9 +128,7 @@ export const urlSearchParamsConstructor = run(
   }
 );
 export const urlSearchParamsDelete = run('urlsearchparams-delete.any.js');
-export const urlSearchParamsForEach = run('urlsearchparams-foreach.any.js', {
-  expectedFailures: ['For-of Check'],
-});
+export const urlSearchParamsForEach = run('urlsearchparams-foreach.any.js');
 export const urlSearchParamsGetAny = run('urlsearchparams-get.any.js');
 export const urlSearchParamsGetAll = run('urlsearchparams-getall.any.js');
 export const urlSearchParamsHas = run('urlsearchparams-has.any.js');

diff --git a/src/workerd/jsg/url.c++ b/src/workerd/jsg/url.c++
@@ -352,6 +352,14 @@ bool UrlSearchParams::operator==(const UrlSearchParams& other) const {
   return toStr() == other.toStr();
 }
 
+void UrlSearchParams::reset(kj::Maybe<kj::ArrayPtr<const char>> input) {
+  KJ_IF_SOME(i, input) {
+    ada_search_params_reset(inner, i.begin(), i.size());
+  } else {
+    ada_search_params_reset(inner, nullptr, 0);
+  }
+}
+
 kj::Maybe<UrlSearchParams> UrlSearchParams::tryParse(kj::ArrayPtr<const char> input) {
   ada_url_search_params result = ada_parse_search_params(input.begin(), input.size());
   if (!result) return kj::none;

diff --git a/src/workerd/jsg/url.h b/src/workerd/jsg/url.h
@@ -199,6 +199,8 @@ class UrlSearchParams final {
     tracker.trackField("inner", toStr());
   }
 
+  void reset(kj::Maybe<kj::ArrayPtr<const char>> input);
+
  private:
   UrlSearchParams(kj::Own<void> inner);
   kj::Own<void> inner;