mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 2

Don't allow duplicate object in a parsed array

Browse source 
This feature was introduced to fix #874 but caused the converter to go
through a deep nested object sometimes, which made program crash on
Windows. So we have to revert the fix even though it makes a regression.

Fixes atom/atom#4904.
This commit is contained in:
Cheng Zhao 2015-01-07 23:20:03 -08:00
parent 640c8f88ff
commit 609e3ec3ff
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/common/native_mate_converters/v8_value_converter.cc
View file

@ -294,10 +294,7 @@ base::Value* V8ValueConverter::FromV8Array(
if (!val->HasRealIndexedProperty(i)) if (!val->HasRealIndexedProperty(i))
continue; continue;
// When parsing elements in an array, we use a new state so we can have the base::Value* child = FromV8ValueImpl(state, child_v8, isolate);
// same object showed twice in array.
FromV8ValueState new_state;
base::Value* child = FromV8ValueImpl(&new_state, child_v8, isolate);
if (child) if (child)
result->Append(child); result->Append(child);
else else

8
spec/api-ipc-spec.coffee
View file

@ -60,14 +60,6 @@ describe 'ipc module', ->
done() done()
ipc.send 'message', obj ipc.send 'message', obj
it 'should work when sending the same object twice in one message', (done) ->
obj = key: 'some'
ipc.once 'message', (message) ->
assert.deepEqual message[0], obj
assert.deepEqual message[1], obj
done()
ipc.send 'message', [obj, obj]
describe 'ipc.sendSync', -> describe 'ipc.sendSync', ->
it 'can be replied by setting event.returnValue', -> it 'can be replied by setting event.returnValue', ->
msg = ipc.sendSync 'echo', 'test' msg = ipc.sendSync 'echo', 'test'