Changeset 54870 in webkit for trunk/JavaScriptCore/runtime/UStringImpl.h

Timestamp:

Feb 16, 2010, 9:57:24 PM (15 years ago)

Author:

[email protected]

Message:

Fix a handful of other leaks seen on the buildbot.

Patch by Gavin Barraclough <​[email protected]> on 2010-02-16
Reviewed by Mark Rowe.

• runtime/UStringImpl.h:

(JSC::UStringOrRopeImpl::deref): Delegate through to the subclass version of deref to ensure that
the correct cleanup takes place. This function previously featured some code that attempted to
skip deletion of static UStringImpl's. Closer inspection revealed that it was in fact equivalent
to "if (false)", meaning that UStringImpl's which had their final deref performed via this function
were leaked.

File:

• trunk/JavaScriptCore/runtime/UStringImpl.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/UStringImpl.h

@@ -347 +347 @@
 inline void UStringOrRopeImpl::deref()
 {
-    m_refCountAndFlags -= s_refCountIncrement;
-    if (!(m_refCountAndFlags & s_refCountMask)) {
-        if (isRope())
-            static_cast<URopeImpl*>(this)->destructNonRecursive();
-        else if (!s_refCountFlagStatic)
-            delete static_cast<UStringImpl*>(this);
-    }
+    if (isRope())
+        static_cast<URopeImpl*>(this)->deref();
+    else
+        static_cast<UStringImpl*>(this)->deref();
 }