source: webkit/trunk/JavaScriptCore/kjs/PropertyNameArray.h@ 37799

Last change on this file since 37799 was 37508, checked in by [email protected], 17 years ago

2008-10-11 Cameron Zwarich <[email protected]>

Reviewed by Sam Weinig.

Bug 21525: 55 StructureID leaks on Wikitravel's main page
<https://bugs.webkit.org/show_bug.cgi?id=21525>

Bug 21533: Simple JavaScript code leaks StructureIDs
<https://bugs.webkit.org/show_bug.cgi?id=21533>

StructureID::getEnumerablePropertyNames() ends up calling back to itself
via JSObject::getPropertyNames(), which causes the PropertyNameArray to
be cached twice. This leads to a memory leak in almost every use of
JSObject::getPropertyNames() on an object. The fix here is based on a
suggestion of Sam Weinig.

This patch also fixes every StructureID leaks that occurs while running
the Mozilla MemBuster test.

  • kjs/PropertyNameArray.h: (JSC::PropertyNameArray::PropertyNameArray): (JSC::PropertyNameArray::setCacheable): (JSC::PropertyNameArray::cacheable):
  • kjs/StructureID.cpp: (JSC::StructureID::getEnumerablePropertyNames):
  • Property svn:eol-style set to native
File size: 4.0 KB
Line 
1/*
2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
3 *
4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version.
8 *
9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details.
13 *
14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA.
18 *
19 */
20
21#ifndef PropertyNameArray_h
22#define PropertyNameArray_h
23
24#include "ExecState.h"
25#include "StructureID.h"
26#include "identifier.h"
27#include <wtf/HashSet.h>
28#include <wtf/Vector.h>
29
30namespace JSC {
31
32 class PropertyNameArrayData : public RefCounted<PropertyNameArrayData> {
33 public:
34 typedef Vector<Identifier, 20> PropertyNameVector;
35 typedef PropertyNameVector::const_iterator const_iterator;
36
37 static PassRefPtr<PropertyNameArrayData> create() { return adoptRef(new PropertyNameArrayData); }
38
39 const_iterator begin() const { return m_propertyNameVector.begin(); }
40 const_iterator end() const { return m_propertyNameVector.end(); }
41
42 PropertyNameVector& propertyNameVector() { return m_propertyNameVector; }
43
44 void setCachedStructureID(StructureID* structureID) { m_cachedStructureID = structureID; }
45 StructureID* cachedStructureID() const { return m_cachedStructureID; }
46
47 void setCachedPrototypeChain(PassRefPtr<StructureIDChain> cachedPrototypeChain) { m_cachedPrototypeChain = cachedPrototypeChain; }
48 StructureIDChain* cachedPrototypeChain() { return m_cachedPrototypeChain.get(); }
49
50 private:
51 PropertyNameArrayData()
52 : m_cachedStructureID(0)
53 {
54 }
55
56 PropertyNameVector m_propertyNameVector;
57 StructureID* m_cachedStructureID;
58 RefPtr<StructureIDChain> m_cachedPrototypeChain;
59 };
60
61 class PropertyNameArray {
62 public:
63 typedef PropertyNameArrayData::const_iterator const_iterator;
64
65 PropertyNameArray(JSGlobalData* globalData)
66 : m_data(PropertyNameArrayData::create())
67 , m_globalData(globalData)
68 , m_cacheable(true)
69 {
70 }
71
72 PropertyNameArray(ExecState* exec)
73 : m_data(PropertyNameArrayData::create())
74 , m_globalData(&exec->globalData())
75 , m_cacheable(true)
76 {
77 }
78
79 JSGlobalData* globalData() { return m_globalData; }
80
81 void add(const Identifier& identifier) { add(identifier.ustring().rep()); }
82 void add(UString::Rep*);
83 void addKnownUnique(UString::Rep* identifier) { m_data->propertyNameVector().append(Identifier(m_globalData, identifier)); }
84
85 size_t size() const { return m_data->propertyNameVector().size(); }
86
87 Identifier& operator[](unsigned i) { return m_data->propertyNameVector()[i]; }
88 const Identifier& operator[](unsigned i) const { return m_data->propertyNameVector()[i]; }
89
90 const_iterator begin() const { return m_data->begin(); }
91 const_iterator end() const { return m_data->end(); }
92
93 void setData(PassRefPtr<PropertyNameArrayData> data) { m_data = data; }
94 PropertyNameArrayData* data() { return m_data.get(); }
95
96 PassRefPtr<PropertyNameArrayData> releaseData() { return m_data.release(); }
97
98 void setCacheable(bool cacheable) { m_cacheable = cacheable; }
99 bool cacheable() const { return m_cacheable; }
100
101 private:
102 typedef HashSet<UString::Rep*, PtrHash<UString::Rep*> > IdentifierSet;
103
104 RefPtr<PropertyNameArrayData> m_data;
105 IdentifierSet m_set;
106 JSGlobalData* m_globalData;
107 bool m_cacheable;
108 };
109
110} // namespace JSC
111
112#endif // PropertyNameArray_h
Note: See TracBrowser for help on using the repository browser.