Changeset 676

Timestamp:

Mar 11, 2010, 7:57:28 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty/JavaScriptCore: Fixed: Stack blocks were free()d twice.

Location:

trunk/src/3rdparty

Files:

• javascriptcore/JavaScriptCore/runtime/MarkStack.h (modified) (5 diffs)
• webkit/JavaScriptCore/runtime/MarkStack.h (modified) (5 diffs)

trunk/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStack.h

@@ -21 +21 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -34 +34 @@
     class JSGlobalData;
     class Register;
-    
+
     enum MarkSetProperties { MayContainNullValues, NoNullValues };
-    
+
     class MarkStack : Noncopyable {
     public:
@@ -49 +49 @@
         ALWAYS_INLINE void append(JSValue);
         ALWAYS_INLINE void append(JSCell*);
-        
+
         ALWAYS_INLINE void appendValues(Register* values, size_t count, MarkSetProperties properties = NoNullValues)
         {
@@ -134 +134 @@
                 return m_data[--m_top];
             }
-            
+
             inline T& last()
             {
@@ -154 +154 @@
                 if (size == m_allocated)
                     return;
-#if PLATFORM(WIN)
-                // We cannot release a part of a region with VirtualFree.  To get around this,
+#if PLATFORM(WIN)
+                // We cannot release a part of a region with VirtualFree.  To get around this,
                 // we'll release the entire region and reallocate the size that we want.
                 releaseStack(m_data, m_allocated);

trunk/src/3rdparty/webkit/JavaScriptCore/runtime/MarkStack.h

@@ -21 +21 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -34 +34 @@
     class JSGlobalData;
     class Register;
-    
+
     enum MarkSetProperties { MayContainNullValues, NoNullValues };
-    
+
     class MarkStack : Noncopyable {
     public:
@@ -49 +49 @@
         ALWAYS_INLINE void append(JSValue);
         void append(JSCell*);
-        
+
         ALWAYS_INLINE void appendValues(Register* values, size_t count, MarkSetProperties properties = NoNullValues)
         {
@@ -134 +134 @@
                 return m_data[--m_top];
             }
-            
+
             inline T& last()
             {
@@ -154 +154 @@
                 if (size == m_allocated)
                     return;
-#if PLATFORM(WIN_OS) || PLATFORM(SYMBIAN)
-                // We cannot release a part of a region with VirtualFree.  To get around this,
+#if PLATFORM(WIN_OS) || PLATFORM(SYMBIAN)
+                // We cannot release a part of a region with VirtualFree.  To get around this,
                 // we'll release the entire region and reallocate the size that we want.
                 releaseStack(m_data, m_allocated);