[PATCH v2 1/2] jscript: Only remove one reference to each entry when clearing the Map or Set.
Gabriel Ivăncescu
gabrielopcode at gmail.com
Mon Jun 6 09:10:11 CDT 2022
Checking for list_empty doesn't stop until all entries have been removed,
no matter their ref count.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
v2: Also fix it for Set...
dlls/jscript/set.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c
index d1ea663..0ef014b 100644
--- a/dlls/jscript/set.c
+++ b/dlls/jscript/set.c
@@ -223,6 +223,7 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j
static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
+ struct jsval_map_entry *entry, *entry2;
MapInstance *map;
HRESULT hres;
@@ -232,10 +233,8 @@ static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned
TRACE("%p\n", map);
- while(!list_empty(&map->entries)) {
- struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry);
+ LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &map->entries, struct jsval_map_entry, list_entry)
delete_map_entry(map, entry);
- }
if(r) *r = jsval_undefined();
return S_OK;
@@ -443,6 +442,7 @@ static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar
static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
+ struct jsval_map_entry *entry, *entry2;
MapInstance *set;
HRESULT hres;
@@ -452,10 +452,8 @@ static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned
TRACE("%p\n", set);
- while(!list_empty(&set->entries)) {
- struct jsval_map_entry *entry = LIST_ENTRY(list_head(&set->entries), struct jsval_map_entry, list_entry);
+ LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &set->entries, struct jsval_map_entry, list_entry)
delete_map_entry(set, entry);
- }
if(r) *r = jsval_undefined();
return S_OK;
--
2.34.1
More information about the wine-devel
mailing list