#include "./bitio.h"
#include "./MD5.h"
+// memory allocation
+
+void* rfx_alloc(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 (while trying to claim %d bytes)\n", size);
+ /* 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 (while trying to claim %d bytes)\n", size);
+ /* 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);
+#endif
+ if(!ptr) {
+ fprintf(stderr, "FATAL: Out of memory (while trying to claim %d bytes)\n", size);
+ /* 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)
+{
+ if(!ptr)
+ return;
+ free(ptr);
+}
+
+#ifdef MEMORY_INFO
+long rfx_memory_used()
+{
+}
+
+char* rfx_memory_used_str()
+{
+}
+#endif
+
// internal constants
#define MALLOC_SIZE 128
#define MEMSIZE(l) (((l/MALLOC_SIZE)+1)*MALLOC_SIZE)
-
// inline wrapper functions
TAG * swf_NextTag(TAG * t) { return t->next; }
swf_ResetWriteBits(t);
if (newlen>t->memsize)
{ U32 newmem = MEMSIZE(newlen);
- 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;
- }
+ U8 * newdata = (U8*)(rfx_realloc(t->data,newmem));
t->memsize = newmem;
t->data = newdata;
}
t->data[t->len++] = a[1];
return 0;
}
+void swf_SetS16(TAG * t,int v)
+{
+ if(v>32767 || v<-32768) {
+ fprintf(stderr, "Warning: S16 overflow: %d\n", v);
+ }
+ swf_SetU16(t, (S16)v);
+}
int swf_SetU32(TAG * t,U32 v)
{ U8 a[4];
src->ymin = center.y-radius;
src->xmax = center.x+radius;
src->ymax = center.y+radius;
- if((center.x|cetner.y|radius) == 0) src->xmax++; //make sure the bbox is not NULL anymore
+ if((center.x|center.y|radius) == 0) src->xmax++; //make sure the bbox is not NULL anymore
return;
}
if(center.x - radius < src->xmin)
src->xmin = center.x - radius;
if(center.x + radius > src->xmax)
- src->xmax = center.x - radius;
+ src->xmax = center.x + radius;
if(center.y - radius < src->ymin)
src->ymin = center.y - radius;
if(center.y + radius > src->ymax)
- src->ymax = center.y - radius;
+ src->ymax = center.y + radius;
}
SPOINT swf_TurnPoint(SPOINT p, MATRIX* m)
{
{
SRECT g;
SPOINT p1,p2,p3,p4,pp1,pp2,pp3,pp4;
+ if(!m)
+ return r;
p1.x = r.xmin;p1.y = r.ymin;
p2.x = r.xmax;p2.y = r.ymin;
p3.x = r.xmin;p3.y = r.ymax;
return 0;
}
-int swf_GetCXForm(TAG * t,CXFORM * cx,U8 alpha) //FIXME: alpha should be type bool
+int swf_GetCXForm(TAG * t,CXFORM * cx,U8 alpha)
{ CXFORM cxf;
int hasadd;
int hasmul;
fprintf(stderr, "rfxswf: Warning- no usable random generator found\n");
fprintf(stderr, "Your password will be vulnerable to dictionary attacks\n");
#endif
+ salt[2] = 0;
md5string = crypt_md5(password, salt);
return 0;
}
n = x-(md5string1+3);
- salt = (char*)malloc(n+1);
+ salt = (char*)rfx_alloc(n+1);
memcpy(salt, md5string1+3, n);
salt[n] = 0;
md5string2 = crypt_md5(password, salt);
- free(salt);
+ rfx_free(salt);
if(strcmp(md5string1, md5string2) != 0)
return 0;
return 1;
TAG * swf_InsertTag(TAG * after,U16 id)
{ TAG * 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;
- }
+ 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;
}
return t;
}
TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)
{ TAG * 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;
- }
+ 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;
}
if(swf && swf->firstTag == before) {
swf->firstTag = t;
void swf_ClearTag(TAG * t)
{
- if (t->data) free(t->data);
+ if (t->data) rfx_free(t->data);
t->data = 0;
t->pos = 0;
t->len = 0;
tag->id = id;
}
+TAG* swf_CopyTag(TAG*tag, TAG*to_copy)
+{
+ tag = swf_InsertTag(tag, to_copy->id);
+ swf_SetBlock(tag, to_copy->data, to_copy->len);
+ return tag;
+}
+
int swf_DeleteTag(TAG * t)
{ if (!t) return -1;
if (t->prev) t->prev->next = t->next;
if (t->next) t->next->prev = t->prev;
- if (t->data) free(t->data);
- free(t);
+ if (t->data) rfx_free(t->data);
+ rfx_free(t);
return 0;
}
if (id==ST_DEFINESPRITE) len = 2*sizeof(U16);
// Sprite handling fix: Flatten sprite tree
- 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 = (TAG *)rfx_calloc(sizeof(TAG));
t->len = len;
t->id = id;
if (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
+ { t->data = (U8*)rfx_alloc(t->len);
+ t->memsize = t->len;
+ if (reader->read(reader, t->data, t->len) != t->len) {
+ fprintf(stderr, "rfxswf: Warning: Short read (tagid %d). File truncated?\n", t->id);
+ free(t->data);t->data=0;
+ free(t);
return NULL;
}
- t->memsize = t->len;
- if (reader->read(reader, t->data, t->len) != t->len) return NULL;
}
if (prev)
it->len = len;
it->id = id;
if (it->len)
- { it->data = (U8*)malloc(it->len);
+ { it->data = (U8*)rfx_alloc(it->len);
it->memsize = it->len;
swf_GetBlock(t, it->data, it->len);
}
break;
}
- free(t->data); t->data = 0;
+ rfx_free(t->data); t->data = 0;
t->memsize = t->len = t->pos = 0;
swf_SetU16(t, spriteid);
t->pos = 0;
id = swf_GetU16(t);
- free(t->data);
+ rfx_free(t->data);
t->len = t->pos = t->memsize = 0;
t->data = 0;
tag->next = level0;
tag->prev = level0->prev;
level0->prev = tag;
- tag->prev->next = tag;
+ if(tag->prev)
+ tag->prev->next = tag;
+ else
+ swf->firstTag = tag;
changes = 1;
}
}
#ifdef INSERT_RFX_TAG
- if (swf->firstTag && swf_NextTag(swf->firstTag))
- if (swf_GetTagID(swf_NextTag(swf->firstTag))!=ST_REFLEX)
+ if (swf->firstTag && swf->firstTag->next &&
+ (swf->firstTag->id != ST_REFLEX || swf->firstTag->next->id != ST_REFLEX)
+ ) {
swf_SetBlock(swf_InsertTagBefore(swf, swf->firstTag,ST_REFLEX),"rfx",3);
+ }
#endif // INSERT_RFX_TAG
while(t) {
len += swf_WriteTag(-1,t);
- if(t->id == ST_DEFINESPRITE) inSprite++;
+ if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++;
else if(t->id == ST_END && inSprite) inSprite--;
+ else if(t->id == ST_END && !inSprite) {
+ if(t->prev && t->prev->id!=ST_SHOWFRAME)
+ frameCount++;
+ }
else if(t->id == ST_SHOWFRAME && !inSprite) frameCount++;
t = swf_NextTag(t);
}
if(handle<0) {
writer_init_nullwriter(&writer);
len = swf_WriteSWF2(&writer, swf);
+ return len;
}
writer_init_filewriter(&writer, handle);
len = swf_WriteSWF2(&writer, swf);
return swf_WriteSWF(fileno(stdout),swf);
}
+SWF* swf_CopySWF(SWF*swf)
+{
+ SWF*nswf = rfx_alloc(sizeof(SWF));
+ TAG*tag, *ntag;
+ memcpy(nswf, swf, sizeof(SWF));
+ nswf->firstTag = 0;
+ tag = swf->firstTag;
+ ntag = 0;
+ while(tag) {
+ ntag = swf_CopyTag(ntag, tag);
+ if(!nswf->firstTag)
+ nswf->firstTag = ntag;
+ tag = tag->next;
+ }
+ return nswf;
+}
+
void swf_FreeTags(SWF * swf) // Frees all malloc'ed memory for tags
{ TAG * t = swf->firstTag;
while (t)
{ TAG * tnew = t->next;
- if (t->data) free(t->data);
- free(t);
+ if (t->data) rfx_free(t->data);
+ rfx_free(t);
t = tnew;
}
swf->firstTag = 0;
#include "modules/swfaction.c"
#include "modules/swfsound.c"
#include "modules/swfdraw.c"
+#include "modules/swfrender.c"