[Swfdec] 2 commits - libswfdec/swfdec_sprite.c

[Benjamin Otte]

 libswfdec/swfdec_sprite.c |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree 13a4101ff86efb11f43e4b28778f1d90a320b118 (from e611b7154a0879ce27caf1372202c036fe35565d)
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Mar 15 23:00:53 2007 +0100

    remove contents from lookup table in error paths

diff --git a/libswfdec/swfdec_sprite.c b/libswfdec/swfdec_sprite.c
index c1b8016..8bbc7c9 100644
--- a/libswfdec/swfdec_sprite.c
+++ b/libswfdec/swfdec_sprite.c
@@ -355,7 +355,7 @@ swfdec_spriteseg_place_object_2 (SwfdecS
     int id = swfdec_bits_get_u16 (bits);
     content->graphic = swfdec_swf_decoder_get_character (s, id);
     if (!SWFDEC_IS_GRAPHIC (content->graphic)) {
-      g_hash_table_remove (sprite->live_content, GUINT_TO_POINTER (content->depth));
+      g_hash_table_remove (s->parse_sprite->live_content, GUINT_TO_POINTER (content->depth));
       swfdec_content_free (content);
       swfdec_sprite_remove_last_action (s->parse_sprite,
 	        s->parse_sprite->parse_frame);
@@ -366,7 +366,7 @@ swfdec_spriteseg_place_object_2 (SwfdecS
     SWFDEC_LOG ("  id = %d", id);
   } else if (content->graphic == NULL) {
     SWFDEC_ERROR ("no character specified and copying didn't give one");
-    g_hash_table_remove (sprite->live_content, GUINT_TO_POINTER (content->depth));
+    g_hash_table_remove (s->parse_sprite->live_content, GUINT_TO_POINTER (content->depth));
     swfdec_content_free (content);
     swfdec_sprite_remove_last_action (s->parse_sprite,
 	      s->parse_sprite->parse_frame);
diff-tree e611b7154a0879ce27caf1372202c036fe35565d (from 6ace3ae6803985e664f83dea6635cf7542e7cf25)
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Mar 15 23:00:53 2007 +0100

    remove contents from lookup table in error paths

diff --git a/libswfdec/swfdec_sprite.c b/libswfdec/swfdec_sprite.c
index 66b4141..c1b8016 100644
--- a/libswfdec/swfdec_sprite.c
+++ b/libswfdec/swfdec_sprite.c
@@ -355,6 +355,7 @@ swfdec_spriteseg_place_object_2 (SwfdecS
     int id = swfdec_bits_get_u16 (bits);
     content->graphic = swfdec_swf_decoder_get_character (s, id);
     if (!SWFDEC_IS_GRAPHIC (content->graphic)) {
+      g_hash_table_remove (sprite->live_content, GUINT_TO_POINTER (content->depth));
       swfdec_content_free (content);
       swfdec_sprite_remove_last_action (s->parse_sprite,
 	        s->parse_sprite->parse_frame);
@@ -365,6 +366,7 @@ swfdec_spriteseg_place_object_2 (SwfdecS
     SWFDEC_LOG ("  id = %d", id);
   } else if (content->graphic == NULL) {
     SWFDEC_ERROR ("no character specified and copying didn't give one");
+    g_hash_table_remove (sprite->live_content, GUINT_TO_POINTER (content->depth));
     swfdec_content_free (content);
     swfdec_sprite_remove_last_action (s->parse_sprite,
 	      s->parse_sprite->parse_frame);