svnno****@sourc*****
svnno****@sourc*****
2011年 4月 7日 (木) 14:46:16 JST
ForkRevision: 535
http://sourceforge.jp/projects/swfed/svn/view?view=rev&revision=535
Author: yoya
Date: 2011-04-07 14:46:16 +0900 (Thu, 07 Apr 2011)
Log Message:
-----------
同一オブジェクトに対して swf_object_input を二度呼ばれた場合に、古いタグを削除よう修正。(今まで memory leak してた)
Modified Paths:
--------------
trunk/src/swf_object.c
-------------- next part --------------
Modified: trunk/src/swf_object.c
===================================================================
--- trunk/src/swf_object.c 2011-04-07 05:44:46 UTC (rev 534)
+++ trunk/src/swf_object.c 2011-04-07 05:46:16 UTC (rev 535)
@@ -26,26 +26,34 @@
static int _swf_object_remove_tag_in_sprite(swf_tag_sprite_detail_t *sprite, swf_tag_t *tag);
static int _swf_object_replace_tag(swf_object_t *swf,
swf_tag_t *old_tag, swf_tag_t *new_tag);
+static void _swf_object_tag_close(swf_tag_t *tag_head);
swf_object_t *
swf_object_open(void) {
swf_object_t *swf;
malloc_debug_start(); /* DEBUG XXX */
swf = (swf_object_t *) calloc(sizeof(*swf), 1);
+ swf->tag_head = NULL;
+ swf->tag_tail = NULL;
//
swf->shape_adjust_mode = 0;
swf->compress_level = Z_DEFAULT_COMPRESSION;
return swf;
}
+static void
+_swf_object_tag_close(swf_tag_t *tag_head) {
+ swf_tag_t *tag, *next_tag;
+ for (tag = tag_head ; tag ; tag = next_tag) {
+ next_tag = tag->next;
+ swf_tag_destroy(tag);
+ }
+ return ;
+}
void
swf_object_close(swf_object_t *swf) {
if (swf) {
- swf_tag_t *tag, *next_tag;
- for (tag = swf->tag_head ; tag ; tag = next_tag) {
- next_tag = tag->next;
- swf_tag_destroy(tag);
- }
+ _swf_object_tag_close(swf->tag_head);
swf->tag_head = NULL;
swf->tag_tail= NULL;
free(swf);
@@ -60,6 +68,9 @@
int result;
bitstream_t *bs;
swf_tag_t *tag, *prev_tag;
+ // 2度呼ばれた時は古い tag を削除
+ _swf_object_tag_close(swf->tag_head);
+
bs = bitstream_open();
bitstream_input(bs, data, data_len);
result = swf_header_parse(bs, &swf->header);