Changeset 11684 in webkit for trunk/JavaScriptCore/kjs/identifier.cpp

Timestamp:

Dec 20, 2005, 12:12:50 PM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

• fixed a leak in the assignment operator from PassRefPtr to RefPtr

• kxmlcore/RefPtr.h: (KXMLCore::RefPtr::operator=):

• fix problem with PassRefPtr that darin spotted - it lacked a copy constructor and therefore was using the default one, which can lead to excess derefs

I fixed this by adding a copy constructor from non-const
reference, and by adding a template pass() function that you have
to use when raw pointer or RefPtr are passed where PassRefPtr is
expected.

• kjs/identifier.cpp: (KJS::Identifier::add): Changed to have PassRefPtr return type and pass() the results.
• kjs/identifier.h:
• kjs/property_map.cpp: (KJS::PropertyMap::addSparseArrayPropertiesToReferenceList): Use pass() where required.
• kjs/ustring.cpp: (KJS::UString::UString): Use pass() as needed. (KJS::UString::append): ditto (KJS::UString::substr): ditto
• kjs/ustring.h: (KJS::UString::UString): Use initializer instead of assignment
• kxmlcore/PassRefPtr.h: (KXMLCore::PassRefPtr::PassRefPtr): Added copy constructor (KXMLCore::pass): new template function to make it convenient to pass a PassRefPtr

WebCore:

Reviewed by Darin.

• change an assignment to a contructor declaration to build with PassRefPtr leak fix changes

• ksvg2/svg/SVGTransformableImpl.cpp: (SVGTransformableImpl::parseTransformAttribute):

File:

• trunk/JavaScriptCore/kjs/identifier.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -124 +124 @@
 }
 
-UString::Rep *Identifier::add(const char *c)
+PassRefPtr<UString::Rep> Identifier::add(const char *c)
 {
     if (!c)
-        return &UString::Rep::null;
+        return pass(&UString::Rep::null);
     int length = strlen(c);
     if (length == 0)
-        return &UString::Rep::empty;
+        return pass(&UString::Rep::empty);
     
-    return *identifierTable().insert<const char *, hash, KJS::equal, convert>(c).first;
+    return pass(*identifierTable().insert<const char *, hash, KJS::equal, convert>(c).first);
 }
 
@@ -164 +164 @@
 }
 
-UString::Rep *Identifier::add(const UChar *s, int length)
+PassRefPtr<UString::Rep> Identifier::add(const UChar *s, int length)
 {
     if (length == 0)
-        return &UString::Rep::empty;
+        return pass(&UString::Rep::empty);
     
     UCharBuffer buf = {s, length}; 
-    return *identifierTable().insert<UCharBuffer, hash, KJS::equal, convert>(buf).first;
-}
-
-UString::Rep *Identifier::add(UString::Rep *r)
+    return pass(*identifierTable().insert<UCharBuffer, hash, KJS::equal, convert>(buf).first);
+}
+
+PassRefPtr<UString::Rep> Identifier::add(UString::Rep *r)
 {
     if (r->isIdentifier)
-        return r;
+        return pass(r);
 
     if (r->len == 0)
-        return &UString::Rep::empty;
+        return pass(&UString::Rep::empty);
 
     UString::Rep *result = *identifierTable().insert(r).first;
     if (result == r)
         r->isIdentifier = true;
-    return result;
+    return pass(result);
 }