new functions

swf_isImageTag()
swf_isShapeTag()
swf_CopyTag()

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index e3d20ee..b192f33 100644 (file)
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -560,7 +560,7 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
                if(id == ST_END)
                    break;
                tag2->len = tag2->memsize = len;
-               tag2->data = rfx_alloc(len);
+               tag2->data = malloc(len);
                memcpy(tag2->data, &tag->data[tag->pos], len);
                /* I never saw recursive sprites, but they are (theoretically) 
                   possible, so better add base here again */
@@ -844,7 +844,7 @@ void swf_Relocate (SWF*swf, char*bitmap)
        } 
        
        num = swf_GetNumUsedIDs(tag);
-       ptr = rfx_alloc(sizeof(int)*num);
+       ptr = malloc(sizeof(int)*num);
        swf_GetUsedIDs(tag, ptr);
 
        for(t=0;t<num;t++) {
@@ -970,11 +970,14 @@ static int tagHash(TAG*tag)
 void swf_Optimize(SWF*swf)
 {
     const int hash_size = 131072;
-    char* dontremap = rfx_calloc(sizeof(char)*65536);
-    U16* remap = rfx_alloc(sizeof(U16)*65536);
-    TAG* id2tag = rfx_calloc(sizeof(TAG*)*65536);
-    TAG** hashmap = rfx_calloc(sizeof(TAG*)*hash_size);
+    char* dontremap = malloc(sizeof(char)*65536);
+    U16* remap = malloc(sizeof(U16)*65536);
+    TAG* id2tag = malloc(sizeof(TAG*)*65536);
+    TAG** hashmap = malloc(sizeof(TAG*)*hash_size);
     TAG* tag;
+    memset(dontremap, 0, sizeof(char)*65536);
+    memset(hashmap, 0, sizeof(TAG*)*hash_size);
+    memset(id2tag, 0, sizeof(TAG*)*65536);
     int t;
     for(t=0;t<65536;t++) {
         remap[t] = t;
@@ -1051,7 +1054,7 @@ void swf_Optimize(SWF*swf)
         if(doremap)
         {
             int num = swf_GetNumUsedIDs(tag);
-            int*positions = rfx_alloc(sizeof(int)*num);
+            int*positions = malloc(sizeof(int)*num);
             int t;
             swf_GetUsedIDs(tag, positions);
             for(t=0;t<num;t++) {
@@ -1059,14 +1062,14 @@ void swf_Optimize(SWF*swf)
                 id = remap[id];
                 PUT16(&tag->data[positions[t]], id);
             }
-            rfx_free(positions);
+            free(positions);
             tag = tag->next;
         }
 
         tag = next;
     }
-    rfx_free(dontremap);
-    rfx_free(remap);
-    rfx_free(id2tag);
-    rfx_free(hashmap);
+    free(dontremap);
+    free(remap);
+    free(id2tag);
+    free(hashmap);
 }

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index ed94927..15b7e2a 100644 (file)
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -50,73 +50,25 @@
 
 // memory allocation
 
-void* rfx_alloc(int size)
+void* rfxalloc(int size)
 {
   void*ptr;
-  if(size == 0) {
-    *(int*)0 = 0xdead;
-    fprintf(stderr, "Warning: Zero alloc\n");
-    return 0;
-  }
-
-  ptr = malloc(size);
-  if(!ptr) {
-    fprintf(stderr, "FATAL: Out of memory\n");
-    /* TODO: we should send a signal, so that the debugger kicks in */
-    exit(1);
-  }
-  return ptr;
-}
-void* rfx_realloc(void*data, int size)
-{
-  void*ptr;
-  if(size == 0) {
-    *(int*)0 = 0xdead;
-    fprintf(stderr, "Warning: Zero realloc\n");
-    rfx_free(data);
-    return 0;
-  }
-  if(!data) {
-    ptr = malloc(size);
-  } else {
-    ptr = realloc(data, size);
-  }
-
-  if(!ptr) {
-    fprintf(stderr, "FATAL: Out of memory\n");
-    /* TODO: we should send a signal, so that the debugger kicks in */
-    exit(1);
-  }
-  return ptr;
-}
-void* rfx_calloc(int size)
-{
-  void*ptr;
-  if(size == 0) {
-    *(int*)0 = 0xdead;
-    fprintf(stderr, "Warning: Zero alloc\n");
-    return 0;
-  }
 #ifdef HAVE_CALLOC
   ptr = calloc(size);
 #else
   ptr = malloc(size);
+  memset(ptr, 0, size);
 #endif
   if(!ptr) {
     fprintf(stderr, "FATAL: Out of memory\n");
     /* TODO: we should send a signal, so that the debugger kicks in */
     exit(1);
   }
-#ifndef HAVE_CALLOC
-  memset(ptr, 0, size);
-#endif
   return ptr;
 }
 
-void rfx_free(void*ptr)
+void rfxdealloc(void*ptr)
 {
-  if(!ptr)
-    return;
   free(ptr);
 }
 
@@ -214,7 +166,15 @@ int swf_SetBlock(TAG * t,U8 * b,int l)
   swf_ResetWriteBits(t);
   if (newlen>t->memsize)
   { U32  newmem  = MEMSIZE(newlen);  
-    U8 * newdata = (U8*)(rfx_realloc(t->data,newmem));
+    U8 * newdata = (U8*)((t->data)?realloc(t->data,newmem):malloc(newmem));
+    if (!newdata)
+    {
+      #ifdef DEBUG_RFXSWF
+        fprintf(stderr,"Fatal Error: malloc()/realloc() failed (1). (%d bytes)\n", newmem);
+       *(int*)0=0;
+      #endif
+      return 0;
+    }
     t->memsize = newmem;
     t->data    = newdata;
   }
@@ -804,12 +764,12 @@ int swf_VerifyPassword(TAG * t, const char * password)
        return 0;
     }
     n = x-(md5string1+3);
-    salt = (char*)rfx_alloc(n+1);
+    salt = (char*)malloc(n+1);
     memcpy(salt, md5string1+3, n);
     salt[n] = 0;
 
     md5string2 = crypt_md5(password, salt);
-    rfx_free(salt);
+    free(salt);
     if(strcmp(md5string1, md5string2) != 0)
        return 0;
     return 1;
@@ -820,15 +780,18 @@ int swf_VerifyPassword(TAG * t, const char * password)
 TAG * swf_InsertTag(TAG * after,U16 id)
 { TAG * t;
 
-  t = (TAG *)rfx_calloc(sizeof(TAG));
-  t->id = id;
-  
-  if (after)
-  {
-    t->prev  = after;
-    t->next  = after->next;
-    after->next = t;
-    if (t->next) t->next->prev = t;
+  t = (TAG *)malloc(sizeof(TAG));
+  if (t)
+  { memset(t,0x00,sizeof(TAG));
+    t->id = id;
+    
+    if (after)
+    {
+      t->prev  = after;
+      t->next  = after->next;
+      after->next = t;
+      if (t->next) t->next->prev = t;
+    }
   }
   return t;
 }
@@ -836,15 +799,18 @@ TAG * swf_InsertTag(TAG * after,U16 id)
 TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)
 { TAG * t;
 
-  t = (TAG *)rfx_calloc(sizeof(TAG));
-  t->id = id;
-  
-  if (before)
-  {
-    t->next  = before;
-    t->prev  = before->prev;
-    before->prev = t;
-    if (t->prev) t->prev->next = t;
+  t = (TAG *)malloc(sizeof(TAG));
+  if (t)
+  { memset(t,0x00,sizeof(TAG));
+    t->id = id;
+    
+    if (before)
+    {
+      t->next  = before;
+      t->prev  = before->prev;
+      before->prev = t;
+      if (t->prev) t->prev->next = t;
+    }
   }
   if(swf && swf->firstTag == before) {
     swf->firstTag = t;
@@ -854,7 +820,7 @@ TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)
 
 void swf_ClearTag(TAG * t)
 {
-  if (t->data) rfx_free(t->data);
+  if (t->data) free(t->data);
   t->data = 0;
   t->pos = 0;
   t->len = 0;
@@ -882,8 +848,8 @@ int swf_DeleteTag(TAG * t)
   if (t->prev) t->prev->next = t->next;
   if (t->next) t->next->prev = t->prev;
 
-  if (t->data) rfx_free(t->data);
-  rfx_free(t);
+  if (t->data) free(t->data);
+  free(t);
   return 0;
 }
 
@@ -908,13 +874,30 @@ TAG * swf_ReadTag(struct reader_t*reader, TAG * prev)
   if (id==ST_DEFINESPRITE) len = 2*sizeof(U16);
   // Sprite handling fix: Flatten sprite tree
 
-  t = (TAG *)rfx_calloc(sizeof(TAG));
+  t = (TAG *)malloc(sizeof(TAG));
+  
+  if (!t)
+  {
+    #ifdef DEBUG_RFXSWF
+      fprintf(stderr,"Fatal Error: malloc()/realloc() failed (2). (%d bytes)\n", sizeof(TAG));
+    #endif
+    return NULL;
+  }
+
+  memset(t,0x00,sizeof(TAG));
   
   t->len = len;
   t->id  = id;
 
   if (t->len)
-  { t->data = (U8*)rfx_alloc(t->len);
+  { t->data = (U8*)malloc(t->len);
+    if (!t->data)
+    {
+      #ifdef DEBUG_RFXSWF
+        fprintf(stderr,"Fatal Error: malloc()/realloc() failed (3). (%d bytes)\n", t->len);
+      #endif
+      return NULL;
+    }
     t->memsize = t->len;
     if (reader->read(reader, t->data, t->len) != t->len) return NULL;
   }
@@ -1055,7 +1038,7 @@ void swf_UnFoldSprite(TAG * t)
     it->len = len;
     it->id  = id;
     if (it->len)
-    { it->data = (U8*)rfx_alloc(it->len);
+    { it->data = (U8*)malloc(it->len);
       it->memsize = it->len;
       swf_GetBlock(t, it->data, it->len);
     }
@@ -1064,7 +1047,7 @@ void swf_UnFoldSprite(TAG * t)
        break;
   }
   
-  rfx_free(t->data); t->data = 0;
+  free(t->data); t->data = 0;
   t->memsize = t->len = t->pos = 0;
 
   swf_SetU16(t, spriteid);
@@ -1089,7 +1072,7 @@ void swf_FoldSprite(TAG * t)
 
   t->pos = 0;
   id = swf_GetU16(t);
-  rfx_free(t->data);
+  free(t->data);
   t->len = t->pos = t->memsize = 0;
   t->data = 0;
 
@@ -1472,8 +1455,8 @@ void swf_FreeTags(SWF * swf)                 // Frees all malloc'ed memory for t
 
   while (t)
   { TAG * tnew = t->next;
-    if (t->data) rfx_free(t->data);
-    rfx_free(t);
+    if (t->data) free(t->data);
+    free(t);
     t = tnew;
   }
   swf->firstTag = 0;

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index e880917..548e679 100644 (file)
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -71,6 +71,10 @@ extern "C" {
 #define REVERSESWAP32(s) (REVERSESWAP16(((s)>>16)&0x0000ffff)|((REVERSESWAP16(s)<<16)&0xffff0000))
 #endif
 
+#define ALLOC_ARRAY(type, num) (((type)*)rfxalloc(sizeof(type)*(num)))
+void* rfxalloc(int size);
+void rfxdealloc(void*data);
+
 // SWF Types
 
 typedef         unsigned long   U32;
@@ -220,6 +224,7 @@ int   swf_DeleteTag(TAG * t);
 
 void  swf_ClearTag(TAG * t);                //frees tag data
 void  swf_ResetTag(TAG*tag, U16 id);        //set's tag position and length to 0, without freeing it
+TAG*  swf_CopyTag(TAG*tag, TAG*to_copy);     //stores a copy of another tag into this taglist
     
 void  swf_SetTagPos(TAG * t,U32 pos);       // resets Bitcount
 U32   swf_GetTagPos(TAG * t);
@@ -726,6 +731,9 @@ void swf_Optimize(SWF*swf);
 U8 swf_isDefiningTag(TAG * t);
 U8 swf_isPseudoDefiningTag(TAG * t);
 U8 swf_isAllowedSpriteTag(TAG * t);
+U8 swf_isImageTag(TAG*tag);
+U8 swf_isShapeTag(TAG*tag);
+
 U16 swf_GetDefineID(TAG * t);
 SRECT swf_GetDefineBBox(TAG * t);
 void swf_SetDefineID(TAG * t, U16 newid);