nodejs
diff --git a/Collapse file
‎lib/internal/url.js‎
Copy file name to clipboardExpand all lines: lib/internal/url.js
+5-3Lines changed: 5 additions & 3 deletions b/Collapse file
‎lib/internal/url.js‎
Copy file name to clipboardExpand all lines: lib/internal/url.js
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/Collapse file
‎src/node_url.cc‎
Copy file name to clipboardExpand all lines: src/node_url.cc
+2-16Lines changed: 2 additions & 16 deletions b/Collapse file
‎src/node_url.cc‎
Copy file name to clipboardExpand all lines: src/node_url.cc
+2-16Lines changed: 2 additions & 16 deletions
diff --git a/Collapse file
‎test/parallel/test-url-null-char.js‎
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/Collapse file
‎test/parallel/test-url-null-char.js‎
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
@@ -559,7 +559,7 @@ function onParseComplete(flags, protocol, username, password,
   initSearchParams(this[searchParams], query);
 }
 
-function onParseError(flags, input) {
+function onParseError(input, flags) {
   throw new ERR_INVALID_URL(input);
 }
 
@@ -641,7 +641,8 @@ class URL {
     }
     this[context] = new URLContext();
     parse(input, -1, base_context, undefined,
-          FunctionPrototypeBind(onParseComplete, this), onParseError);
+          FunctionPrototypeBind(onParseComplete, this),
+          FunctionPrototypeBind(onParseError, this, input));
   }
 
   get [special]() {
@@ -760,7 +761,8 @@ class URL {
     // toUSVString is not needed.
     input = `${input}`;
     parse(input, -1, undefined, undefined,
-          FunctionPrototypeBind(onParseComplete, this), onParseError);
+          FunctionPrototypeBind(onParseComplete, this),
+          FunctionPrototypeBind(onParseError, this, input));
   }
 
   // readonly
 
@@ -142,22 +142,12 @@ URLHost::~URLHost() {
   XX(ARG_FRAGMENT)                                                            \
   XX(ARG_COUNT)  // This one has to be last.
 
-#define ERR_ARGS(XX)                                                          \
-  XX(ERR_ARG_FLAGS)                                                           \
-  XX(ERR_ARG_INPUT)                                                           \
-
 enum url_cb_args {
 #define XX(name) name,
   ARGS(XX)
 #undef XX
 };
 
-enum url_error_cb_args {
-#define XX(name) name,
-  ERR_ARGS(XX)
-#undef XX
-};
-
 #define TWO_CHAR_STRING_TEST(bits, name, expr)                                \
   template <typename T>                                                       \
   bool name(const T ch1, const T ch2) {                                \
@@ -1679,12 +1669,8 @@ void Parse(Environment* env,
     SetArgs(env, argv, url);
     cb->Call(context, recv, arraysize(argv), argv).FromMaybe(Local<Value>());
   } else if (error_cb->IsFunction()) {
-    Local<Value> argv[2] = { undef, undef };
-    argv[ERR_ARG_FLAGS] = Integer::NewFromUnsigned(isolate, url.flags);
-    argv[ERR_ARG_INPUT] =
-      String::NewFromUtf8(env->isolate(), input).ToLocalChecked();
-    error_cb.As<Function>()->Call(context, recv, arraysize(argv), argv)
-        .FromMaybe(Local<Value>());
+    Local<Value> flags = Integer::NewFromUnsigned(isolate, url.flags);
+    USE(error_cb.As<Function>()->Call(context, recv, 1, &flags));
   }
 }
 
 
@@ -0,0 +1,8 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+
+assert.throws(
+  () => { new URL('a\0b'); },
+  { input: 'a\0b' }
+);
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ function onParseComplete(flags, protocol, username, password,`
`559`	`559`	`initSearchParams(this[searchParams], query);`
`560`	`560`	`}`
`561`	`561`
`562`		`-function onParseError(flags, input) {`
	`562`	`+function onParseError(input, flags) {`
`563`	`563`	`throw new ERR_INVALID_URL(input);`
`564`	`564`	`}`
`565`	`565`
`@@ -641,7 +641,8 @@ class URL {`
`641`	`641`	`}`
`642`	`642`	`this[context] = new URLContext();`
`643`	`643`	`parse(input, -1, base_context, undefined,`
`644`		`- FunctionPrototypeBind(onParseComplete, this), onParseError);`
	`644`	`+ FunctionPrototypeBind(onParseComplete, this),`
	`645`	`+ FunctionPrototypeBind(onParseError, this, input));`
`645`	`646`	`}`
`646`	`647`
`647`	`648`	`get [special]() {`
`@@ -760,7 +761,8 @@ class URL {`
`760`	`761`	`// toUSVString is not needed.`
`761`	`762`	input = `${input}`;
`762`	`763`	`parse(input, -1, undefined, undefined,`
`763`		`- FunctionPrototypeBind(onParseComplete, this), onParseError);`
	`764`	`+ FunctionPrototypeBind(onParseComplete, this),`
	`765`	`+ FunctionPrototypeBind(onParseError, this, input));`
`764`	`766`	`}`
`765`	`767`
`766`	`768`	`// readonly`