git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
526824b
)
let END tags increase the frame count under special circumstances.
author
kramm
<kramm>
Sun, 7 Nov 2004 16:24:50 +0000
(16:24 +0000)
committer
kramm
<kramm>
Sun, 7 Nov 2004 16:24:50 +0000
(16:24 +0000)
lib/rfxswf.c
patch
|
blob
|
history
diff --git
a/lib/rfxswf.c
b/lib/rfxswf.c
index
3ee5c6e
..
beef81e
100644
(file)
--- a/
lib/rfxswf.c
+++ b/
lib/rfxswf.c
@@
-214,15
+214,7
@@
int swf_SetBlock(TAG * t,U8 * b,int l)
swf_ResetWriteBits(t);
if (newlen>t->memsize)
{ U32 newmem = MEMSIZE(newlen);
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->memsize = newmem;
t->data = newdata;
}
@@
-812,12
+804,12
@@
int swf_VerifyPassword(TAG * t, const char * password)
return 0;
}
n = x-(md5string1+3);
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);
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;
if(strcmp(md5string1, md5string2) != 0)
return 0;
return 1;
@@
-828,18
+820,15
@@
int swf_VerifyPassword(TAG * t, const char * password)
TAG * swf_InsertTag(TAG * after,U16 id)
{ TAG * t;
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;
}
}
return t;
}
@@
-847,18
+836,15
@@
TAG * swf_InsertTag(TAG * after,U16 id)
TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)
{ TAG * 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;
}
if(swf && swf->firstTag == before) {
swf->firstTag = t;
@@
-868,7
+854,7
@@
TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)
void swf_ClearTag(TAG * 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;
t->data = 0;
t->pos = 0;
t->len = 0;
@@
-896,8
+882,8
@@
int swf_DeleteTag(TAG * t)
if (t->prev) t->prev->next = t->next;
if (t->next) t->next->prev = t->prev;
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;
}
return 0;
}
@@
-922,30
+908,13
@@
TAG * swf_ReadTag(struct reader_t*reader, TAG * prev)
if (id==ST_DEFINESPRITE) len = 2*sizeof(U16);
// Sprite handling fix: Flatten sprite tree
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->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
- return NULL;
- }
+ { t->data = (U8*)rfx_alloc(t->len);
t->memsize = t->len;
if (reader->read(reader, t->data, t->len) != t->len) return NULL;
}
t->memsize = t->len;
if (reader->read(reader, t->data, t->len) != t->len) return NULL;
}
@@
-1086,7
+1055,7
@@
void swf_UnFoldSprite(TAG * t)
it->len = len;
it->id = id;
if (it->len)
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);
}
it->memsize = it->len;
swf_GetBlock(t, it->data, it->len);
}
@@
-1095,7
+1064,7
@@
void swf_UnFoldSprite(TAG * t)
break;
}
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->memsize = t->len = t->pos = 0;
swf_SetU16(t, spriteid);
@@
-1120,7
+1089,7
@@
void swf_FoldSprite(TAG * t)
t->pos = 0;
id = swf_GetU16(t);
t->pos = 0;
id = swf_GetU16(t);
- free(t->data);
+ rfx_free(t->data);
t->len = t->pos = t->memsize = 0;
t->data = 0;
t->len = t->pos = t->memsize = 0;
t->data = 0;
@@
-1341,6
+1310,10
@@
int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file,
len += swf_WriteTag(-1,t);
if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++;
else if(t->id == ST_END && inSprite) inSprite--;
len += swf_WriteTag(-1,t);
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);
}
else if(t->id == ST_SHOWFRAME && !inSprite) frameCount++;
t = swf_NextTag(t);
}
@@
-1503,8
+1476,8
@@
void swf_FreeTags(SWF * swf) // Frees all malloc'ed memory for t
while (t)
{ TAG * tnew = t->next;
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;
t = tnew;
}
swf->firstTag = 0;