Benjamin Otte
2008-Jan-04 09:44 UTC
[Swfdec] 2 commits - libswfdec/swfdec_style_sheet.c test/trace
libswfdec/swfdec_style_sheet.c | 4 ++--
test/trace/Makefile.am | 9 +++++++++
test/trace/crash-0.5.5-stylesheet-update-5.swf |binary
test/trace/crash-0.5.5-stylesheet-update-6.swf |binary
test/trace/crash-0.5.5-stylesheet-update-7.swf |binary
test/trace/crash-0.5.5-stylesheet-update-8.swf |binary
test/trace/crash-0.5.5-stylesheet-update.as | 8 ++++++++
7 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 73a5950c72a59cbb692d8f0d6e64f70ce951b1a9
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Jan 4 10:43:40 2008 +0100
only reset text if there is text
fixes just-committed crash test
diff --git a/libswfdec/swfdec_style_sheet.c b/libswfdec/swfdec_style_sheet.c
index d17768c..6084b9e 100644
--- a/libswfdec/swfdec_style_sheet.c
+++ b/libswfdec/swfdec_style_sheet.c
@@ -259,8 +259,8 @@ swfdec_style_sheet_update (SwfdecAsContext *cx,
SwfdecAsObject *object,
for (iter = style->listeners; iter != NULL; iter = iter->next) {
g_assert (SWFDEC_IS_TEXT_FIELD_MOVIE (iter->data));
text = iter->data;
- g_assert (text->style_sheet_input != NULL);
- swfdec_text_field_movie_set_text (text, text->style_sheet_input, TRUE);
+ if (text->style_sheet_input != NULL)
+ swfdec_text_field_movie_set_text (text, text->style_sheet_input,
TRUE);
}
}
commit df51ea79480d2a1c2b0cd5a69aa82c13856b2787
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Jan 4 10:42:02 2008 +0100
add test for a crasher
diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index 7b9ff52..6c6e128 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -657,6 +657,15 @@ EXTRA_DIST = \
crash-0.5.4-huge-image-7.swf.trace \
crash-0.5.4-huge-image-8.swf \
crash-0.5.4-huge-image-8.swf.trace \
+ crash-0.5.5-stylesheet-update.as \
+ crash-0.5.5-stylesheet-update-5.swf \
+ crash-0.5.5-stylesheet-update-5.swf.trace \
+ crash-0.5.5-stylesheet-update-6.swf \
+ crash-0.5.5-stylesheet-update-6.swf.trace \
+ crash-0.5.5-stylesheet-update-7.swf \
+ crash-0.5.5-stylesheet-update-7.swf.trace \
+ crash-0.5.5-stylesheet-update-8.swf \
+ crash-0.5.5-stylesheet-update-8.swf.trace \
currentframe.swf \
currentframe.swf.trace \
dangling-compare.as \
diff --git a/test/trace/crash-0.5.5-stylesheet-update-5.swf
b/test/trace/crash-0.5.5-stylesheet-update-5.swf
new file mode 100644
index 0000000..142dd44
Binary files /dev/null and b/test/trace/crash-0.5.5-stylesheet-update-5.swf
differ
diff --git a/test/trace/crash-0.5.5-stylesheet-update-5.swf.trace
b/test/trace/crash-0.5.5-stylesheet-update-5.swf.trace
new file mode 100644
index 0000000..e69de29
diff --git a/test/trace/crash-0.5.5-stylesheet-update-6.swf
b/test/trace/crash-0.5.5-stylesheet-update-6.swf
new file mode 100644
index 0000000..715fe8e
Binary files /dev/null and b/test/trace/crash-0.5.5-stylesheet-update-6.swf
differ
diff --git a/test/trace/crash-0.5.5-stylesheet-update-6.swf.trace
b/test/trace/crash-0.5.5-stylesheet-update-6.swf.trace
new file mode 100644
index 0000000..e69de29
diff --git a/test/trace/crash-0.5.5-stylesheet-update-7.swf
b/test/trace/crash-0.5.5-stylesheet-update-7.swf
new file mode 100644
index 0000000..ae74ee1
Binary files /dev/null and b/test/trace/crash-0.5.5-stylesheet-update-7.swf
differ
diff --git a/test/trace/crash-0.5.5-stylesheet-update-7.swf.trace
b/test/trace/crash-0.5.5-stylesheet-update-7.swf.trace
new file mode 100644
index 0000000..e69de29
diff --git a/test/trace/crash-0.5.5-stylesheet-update-8.swf
b/test/trace/crash-0.5.5-stylesheet-update-8.swf
new file mode 100644
index 0000000..e1b7072
Binary files /dev/null and b/test/trace/crash-0.5.5-stylesheet-update-8.swf
differ
diff --git a/test/trace/crash-0.5.5-stylesheet-update-8.swf.trace
b/test/trace/crash-0.5.5-stylesheet-update-8.swf.trace
new file mode 100644
index 0000000..e69de29
diff --git a/test/trace/crash-0.5.5-stylesheet-update.as
b/test/trace/crash-0.5.5-stylesheet-update.as
new file mode 100644
index 0000000..a10c76e
--- /dev/null
+++ b/test/trace/crash-0.5.5-stylesheet-update.as
@@ -0,0 +1,8 @@
+// makeswf -v 7 -s 200x150 -r 1 -o crash-0.5.5-stylesheet-update.swf
crash-0.5.5-stylesheet-update.as
+
+createTextField ("t", 0, 0, 0, 200, 150);
+s = new TextField.StyleSheet ();
+t.styleSheet = s;
+s.update ();
+
+loadMovie ("fscommand:quit", "");