From c21c21f9f9b4871c81e6babf08b708cd2aed745c Mon Sep 17 00:00:00 2001 From: Zidong Jiang Date: Tue, 5 Sep 2017 14:19:25 +0800 Subject: [PATCH] [ecma-collection] Check whether the header's first chunk is NULL Fix Issue: #1997 JerryScript-DCO-1.0-Signed-off-by: Zidong Jiang zidong.jiang@intel.com --- .../base/ecma-helpers-values-collection.c | 3 ++- .../es2015/regression-test-issue-1997.js | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 tests/jerry/es2015/regression-test-issue-1997.js diff --git a/jerry-core/ecma/base/ecma-helpers-values-collection.c b/jerry-core/ecma/base/ecma-helpers-values-collection.c index afc564ea4..f02ee843d 100644 --- a/jerry-core/ecma/base/ecma-helpers-values-collection.c +++ b/jerry-core/ecma/base/ecma-helpers-values-collection.c @@ -318,7 +318,8 @@ bool ecma_collection_iterator_next (ecma_collection_iterator_t *iterator_p) /**< context of iterator */ { if (iterator_p->header_p == NULL - || unlikely (iterator_p->header_p->unit_number == 0)) + || unlikely (iterator_p->header_p->unit_number == 0) + || unlikely (iterator_p->header_p->first_chunk_cp == JMEM_CP_NULL)) { return false; } diff --git a/tests/jerry/es2015/regression-test-issue-1997.js b/tests/jerry/es2015/regression-test-issue-1997.js new file mode 100644 index 000000000..475272b91 --- /dev/null +++ b/tests/jerry/es2015/regression-test-issue-1997.js @@ -0,0 +1,19 @@ +// Copyright JS Foundation and other contributors, http://js.foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +var a = Promise.resolve(); +for (var i = 0; i < 200; i++) +{ + Promise.race([a]).then(); +}