Changeset 244

Timestamp:

04/10/08 21:39:33

Author:

ralf

Message:

some more memory leak fixes (thanks to INADA Naoki)

Files:

• trunk/src/SWFFile.cpp (modified) (7 diffs)
• trunk/src/SWFGlyphList.cpp (modified) (2 diffs)
• trunk/src/SWFItem.cpp (modified) (3 diffs)

trunk/src/SWFFile.cpp

@@ -103 +103 @@
-        
-fail:
-
+[]
-        if( !_ctx && ctx ) delete ctx;
-        return 0;
@@ -158 +158 @@
-
-        delete w;
-
-&& ctx 
+[]
+
-        return( length+8 );
-        
-fail:
-if( w ) 
-if( data ) delete
-&& ctx 
+
+delete[]
+
-        return 0;
-}
@@ -173 +173 @@
-        ctx = _ctx ? _ctx : new Context;
-
-
+ = 0
-        xmlNodePtr root;
-        
@@ -194 +194 @@
-        header->writeXML( root, ctx );
-        
-&& ctx 
+
-        return doc;
-        
-fail:
-( doc ) xmlFree( doc 
-&& ctx 
+ (doc) xmlFreeDoc(doc
+
-        return NULL;
-}
@@ -214 +214 @@
-        if( size ) fwrite( data, size, 1, fp );
-
-
+
+
-        return size;
-        
-fail:
-delete[] data
+xmlFree(data)
-        return 0;
-}
@@ -268 +269 @@
-
-        length = (header->getSize(ctx,0)/8);
-
-&& ctx 
+
+
-        return length+8;
-        
-fail:
-&& ctx 
+
-        return 0;
-}
@@ -290 +291 @@
-        root = doc->xmlRootNode;
-        length = setXML( root, ctx );
-
+
-        xmlFreeDoc( doc );
-        return length;

trunk/src/SWFGlyphList.cpp

@@ -13 +13 @@
-
-GlyphList::~GlyphList() {
-if( glyphs ) delete
-if( map ) delete
+delete[]
+delete[]
-}
-
@@ -243 +243 @@
-
-void GlyphList::allocate( int n ) {
-if( map ) delete
-if( glyphs ) delete
+delete[]
+delete[]
-
-        nGlyphs = n;

trunk/src/SWFItem.cpp

@@ -126 +126 @@
-
-Rest::~Rest() {
-if( data ) delete
+delete[]
-}
-
@@ -212 +212 @@
-                        memcpy( data, dst, lout );
-                }
-
+[]
-                xmlFree( xmld );
-        } 
@@ -223 +223 @@
-
-void Rest::setdata( unsigned char *d, int s ) {
-if( data ) delete
+delete[]
-        data = NULL;
-        size = s;