Changeset 11684 in webkit for trunk/JavaScriptCore/kjs/ustring.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/ustring.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -200 +200 @@
   r->usedPreCapacity = 0;
   r->preCapacity = 0;
+
   // steal the single reference this Rep was created with
   return PassRefPtr<Rep>::adopt(r);
@@ -229 +230 @@
   r->usedPreCapacity = 0;
   r->preCapacity = 0;
+
   // steal the single reference this Rep was created with
   return PassRefPtr<Rep>::adopt(r);
@@ -458 +460 @@
     x.expandCapacity(aOffset + length);
     memcpy(const_cast<UChar *>(a.data() + aSize), b.data(), bSize * sizeof(UChar));
-    m_rep = Rep::create(a.m_rep, 0, length);
+    m_rep = Rep::create(pass(a.m_rep), 0, length);
   } else if (-bOffset == b.usedPreCapacity() && 4 * bSize >= aSize) {
     // - b reaches the beginning of its buffer so it qualifies for shared prepend
@@ -466 +468 @@
     y.expandPreCapacity(-bOffset + aSize);
     memcpy(const_cast<UChar *>(b.data() - aSize), a.data(), aSize * sizeof(UChar));
-    m_rep = Rep::create(b.m_rep, -aSize, length);
+    m_rep = Rep::create(pass(b.m_rep), -aSize, length);
   } else {
     // a does not qualify for append, and b does not qualify for prepend, gotta make a whole new string
@@ -684 +686 @@
     expandCapacity(thisOffset + length);
     memcpy(const_cast<UChar *>(data() + thisSize), t.data(), tSize * sizeof(UChar));
-    m_rep = Rep::create(m_rep, 0, length);
+    m_rep = Rep::create(pass(m_rep), 0, length);
   } else {
     // this is shared with someone using more capacity, gotta make a whole new string
@@ -725 +727 @@
     for (int i = 0; i < tSize; ++i)
       d[thisSize+i] = t[i];
-    m_rep = Rep::create(m_rep, 0, length);
+    m_rep = Rep::create(pass(m_rep), 0, length);
   } else {
     // this is shared with someone using more capacity, gotta make a whole new string
@@ -765 +767 @@
     UChar *d = const_cast<UChar *>(data());
     d[length] = c;
-    m_rep = Rep::create(m_rep, 0, length + 1);
+    m_rep = Rep::create(pass(m_rep), 0, length + 1);
   } else {
     // this is shared with someone using more capacity, gotta make a whole new string
@@ -1121 +1123 @@
     return *this;
 
-  return UString(Rep::create(m_rep, pos, len));
+  return UString(Rep::create(pass(m_rep), pos, len));
 }