repl: Mitigate vm #548 function redefinition issue #7624

princejwesley · 2016-07-08T23:21:33Z

Checklist

make -j4 test (UNIX), or vcbuild test nosign (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines

Affected core subsystem(s)

repl

Description of change

Transformed function XXX(...) to var XXX = function XXX(...) in order to mitigate vm #548 function redefinition issue

Before

node 🙈 ₹ git:(master) ./node
> process.version
'v7.0.0-pre'
> function name() { return "node"; };
undefined
> name()
'node'
> function name() { return "nodejs"; };
undefined
> name()
'node'  // should be 'nodejs'
>

After

node 🙈 ₹ git:(upstream ⚡ repl-tmp-548) ./node
> function name() { return "node"; };
undefined
> name()
'node'
> function name() { return "nodejs"; };
undefined
> name()
'nodejs'
>

```js node 🙈 ₹ git:(upstream ⚡ repl-tmp-548) ./node > function name() { return "node"; }; undefined > name() 'node' > function name() { return "nodejs"; }; undefined > name() 'nodejs' > ```

Trott · 2016-07-08T23:43:19Z

test/parallel/test-repl.js

@@ -328,6 +328,11 @@ function error_test() {
    // or block comment. https://github.com/nodejs/node/issues/3611
    { client: client_unix, send: 'a = 3.5e',
      expect: /^SyntaxError: Invalid or unexpected token/ },
+    // Mitigate #548 issue


Nit: I'd prefer this be the full URL to the issue rather than just the issue number. (Some issues scattered throughout the code are in nodejs/node-archive (formerly joyent/node, I believe) rather than nodejs/node and using the full URL eliminates guesswork. (Not the comment 3 lines above contains a full issue URL.)

addaleax · 2016-07-09T13:18:44Z

LGTM

Btw, there’s one edge case with unexpected results that will enabled by this change:

> function a() { return 42; } ()
undefined
> a
42

I think it’s okay to accept that as a side effect, though.

CI: https://ci.nodejs.org/job/node-test-commit/4035/

Trott · 2016-07-10T02:06:35Z

Maybe add the edge case identified by @addaleax as a known-issues test?

thefourtheye · 2016-07-10T14:23:37Z

test/known_issues/test-repl-function-redefinition-edge-case.js

+
+const expected = '1\n[Function a]\n';
+const got = r.output.accumulator.join('');
+assert.equal(got, expected);


Use strict version

thefourtheye · 2016-07-10T14:25:15Z

Change LGTM, pending CI. We should accept that this will change multiline strings and comments as well.

princejwesley · 2016-07-10T23:52:11Z

... We should accept that this will change multiline strings and comments as well.

@thefourtheye I am not quite sure what you meant.

thefourtheye · 2016-07-11T03:36:41Z

This will replace the definitions even if they are defined within comments or mutiline strings, right?

Edit: nvm. This PR doesn't concern Strings and comments. LGTM stays.

lance · 2016-07-15T16:31:50Z

LGTM
New CI: https://ci.nodejs.org/job/node-test-pull-request/3302/
Flakey unrelated failure

lance · 2016-07-15T17:45:32Z

Landed in bb9eabe

```js node 🙈 ₹ git:(upstream ⚡ repl-tmp-548) ./node > function name() { return "node"; }; undefined > name() 'node' > function name() { return "nodejs"; }; undefined > name() 'nodejs' > ``` Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Lance Ball <lball@redhat.com>

evanlucas · 2016-07-19T11:07:34Z

This isn't landing cleanly on v6.x Mind sending a backport PR to v6.x? Thanks!

princejwesley · 2016-07-19T16:07:08Z

@evanlucas branch name?

lance · 2016-07-19T17:00:44Z

@princejwesley v6.x

deps: update V8 to 6a72f3 Fixes nodejs#548 Makes nodejs#7624 unnecessary.

`test/known_issues/test-repl-function-redefinition-edge-case.js` had been introduced as a part of nodejs#7624 but the meat of the test became fixed in 007386e. Despite that, the test continued to fail since it was broken itself: there was a missing colon in the expected output. This commit adds the missing colon and moves the test from `test/known_issues` to `test/parallel`.

`test/known_issues/test-repl-function-redefinition-edge-case.js` had been introduced as a part of #7624 but the meat of the test became fixed in 007386e. Despite that, the test continued to fail since it was broken itself: there was a missing colon in the expected output. This commit adds the missing colon and moves the test from `test/known_issues` to `test/parallel`. PR-URL: #11772 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

`test/known_issues/test-repl-function-redefinition-edge-case.js` had been introduced as a part of nodejs#7624 but the meat of the test became fixed in 007386e. Despite that, the test continued to fail since it was broken itself: there was a missing colon in the expected output. This commit adds the missing colon and moves the test from `test/known_issues` to `test/parallel`. PR-URL: nodejs#11772 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

repl: Mitigate vm nodejs#548 function redefinition issue

761e8df

```js node 🙈 ₹ git:(upstream ⚡ repl-tmp-548) ./node > function name() { return "node"; }; undefined > name() 'node' > function name() { return "nodejs"; }; undefined > name() 'nodejs' > ```

nodejs-github-bot added the repl Issues and PRs related to the REPL subsystem. label Jul 8, 2016

Trott reviewed Jul 8, 2016
View reviewed changes

Add absolute issue URL

db8d809

Add known issue test

f1eb84e

princejwesley force-pushed the repl-tmp-548 branch from 44ddbc7 to f1eb84e Compare July 10, 2016 08:49

thefourtheye reviewed Jul 10, 2016
View reviewed changes

Use strictEquals assertion

13f8f3a

lance closed this Jul 15, 2016

princejwesley mentioned this pull request Jul 19, 2016

repl: Mitigate vm #548 function redefinition issue #7794

Closed

3 tasks

fhinkel added a commit to v8/node that referenced this pull request Sep 18, 2016

Merge pull request #1 from fhinkel/vee-eight-lkgr

b40f36c

deps: update V8 to 6a72f3 Fixes nodejs#548 Makes nodejs#7624 unnecessary.

fhinkel mentioned this pull request Sep 19, 2016

Function redefinition in vm.runInContext #548

Closed

MylesBorins added the dont-land-on-v4.x label Sep 30, 2016

bnoordhuis mentioned this pull request Jan 22, 2017

Function declaration throws in REPL #10950

Closed

aqrln mentioned this pull request Mar 9, 2017

test: fix repl-function-redefinition-edge-case #11772

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

repl: Mitigate vm #548 function redefinition issue #7624

repl: Mitigate vm #548 function redefinition issue #7624

princejwesley commented Jul 8, 2016

Trott Jul 8, 2016

addaleax commented Jul 9, 2016

Trott commented Jul 10, 2016

thefourtheye Jul 10, 2016

thefourtheye commented Jul 10, 2016

princejwesley commented Jul 10, 2016 •

edited

Loading

thefourtheye commented Jul 11, 2016 •

edited

Loading

lance commented Jul 15, 2016 •

edited

Loading

lance commented Jul 15, 2016

evanlucas commented Jul 19, 2016

princejwesley commented Jul 19, 2016

lance commented Jul 19, 2016

repl: Mitigate vm #548 function redefinition issue #7624

repl: Mitigate vm #548 function redefinition issue #7624

Conversation

princejwesley commented Jul 8, 2016

Checklist

Affected core subsystem(s)

Description of change

Before

After

Trott Jul 8, 2016

Choose a reason for hiding this comment

addaleax commented Jul 9, 2016

Trott commented Jul 10, 2016

thefourtheye Jul 10, 2016

Choose a reason for hiding this comment

thefourtheye commented Jul 10, 2016

princejwesley commented Jul 10, 2016 • edited Loading

thefourtheye commented Jul 11, 2016 • edited Loading

lance commented Jul 15, 2016 • edited Loading

lance commented Jul 15, 2016

evanlucas commented Jul 19, 2016

princejwesley commented Jul 19, 2016

lance commented Jul 19, 2016

princejwesley commented Jul 10, 2016 •

edited

Loading

thefourtheye commented Jul 11, 2016 •

edited

Loading

lance commented Jul 15, 2016 •

edited

Loading