[Swfdec-commits] 3 commits -

[Benjamin Otte]

 0 files changed

New commits:
commit ff1de463bbb64b29ef95e8dfc5b16532ed71f5b7
Merge: 80f91fb... 1cb0d58...
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Nov 4 23:31:50 2008 +0100

    Merge branch '0.8'
    
    Conflicts:
    
    	test/trace/Makefile.am

commit 1cb0d584ac024b904ce7331702bc19103762d226
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Nov 4 22:52:03 2008 +0100

    add a test for just-fixed crasher

diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index 62322f7..f9e289d 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -1031,6 +1031,15 @@ EXTRA_DIST = \
 	crash-0.8.2-gotoAndPlay-8.swf \
 	crash-0.8.2-gotoAndPlay-8.swf.trace \
 	crash-0.8.2-gotoAndPlay.as \
+	crash-0.8.2-sendAndLoad-without-target-5.swf \
+	crash-0.8.2-sendAndLoad-without-target-5.swf.trace \
+	crash-0.8.2-sendAndLoad-without-target-6.swf \
+	crash-0.8.2-sendAndLoad-without-target-6.swf.trace \
+	crash-0.8.2-sendAndLoad-without-target-7.swf \
+	crash-0.8.2-sendAndLoad-without-target-7.swf.trace \
+	crash-0.8.2-sendAndLoad-without-target-8.swf \
+	crash-0.8.2-sendAndLoad-without-target-8.swf.trace \
+	crash-0.8.2-sendAndLoad-without-target.as \
 	createEmptyMovieClip-events.sc \
 	createEmptyMovieClip-events.swf \
 	createEmptyMovieClip-events.swf.trace \
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target-5.swf b/test/trace/crash-0.8.2-sendAndLoad-without-target-5.swf
new file mode 100644
index 0000000..fef2098
Binary files /dev/null and b/test/trace/crash-0.8.2-sendAndLoad-without-target-5.swf differ
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target-5.swf.trace b/test/trace/crash-0.8.2-sendAndLoad-without-target-5.swf.trace
new file mode 100644
index 0000000..e69de29
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target-6.swf b/test/trace/crash-0.8.2-sendAndLoad-without-target-6.swf
new file mode 100644
index 0000000..a272050
Binary files /dev/null and b/test/trace/crash-0.8.2-sendAndLoad-without-target-6.swf differ
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target-6.swf.trace b/test/trace/crash-0.8.2-sendAndLoad-without-target-6.swf.trace
new file mode 100644
index 0000000..e69de29
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target-7.swf b/test/trace/crash-0.8.2-sendAndLoad-without-target-7.swf
new file mode 100644
index 0000000..558f71d
Binary files /dev/null and b/test/trace/crash-0.8.2-sendAndLoad-without-target-7.swf differ
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target-7.swf.trace b/test/trace/crash-0.8.2-sendAndLoad-without-target-7.swf.trace
new file mode 100644
index 0000000..e69de29
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target-8.swf b/test/trace/crash-0.8.2-sendAndLoad-without-target-8.swf
new file mode 100644
index 0000000..00c316a
Binary files /dev/null and b/test/trace/crash-0.8.2-sendAndLoad-without-target-8.swf differ
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target-8.swf.trace b/test/trace/crash-0.8.2-sendAndLoad-without-target-8.swf.trace
new file mode 100644
index 0000000..e69de29
diff --git a/test/trace/crash-0.8.2-sendAndLoad-without-target.as b/test/trace/crash-0.8.2-sendAndLoad-without-target.as
new file mode 100644
index 0000000..654b15a
--- /dev/null
+++ b/test/trace/crash-0.8.2-sendAndLoad-without-target.as
@@ -0,0 +1,6 @@
+// makeswf -v 7 -s 200x150 -r 15 -o crash-0.8.2-sendAndLoad-without-target.swf crash-0.8.2-sendAndLoad-without-target.as
+
+l = new LoadVars ();
+l.sendAndLoad ("hello", undefined);
+
+getURL ("fscommand:quit", "");
commit 112d364792e1257819a217d3e55823566cb1d713
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Nov 4 22:49:36 2008 +0100

    fix crasher when target could not be converted to an object

diff --git a/swfdec/swfdec_load_object_as.c b/swfdec/swfdec_load_object_as.c
index 0326a37..a1a7956 100644
--- a/swfdec/swfdec_load_object_as.c
+++ b/swfdec/swfdec_load_object_as.c
@@ -223,7 +223,7 @@ swfdec_load_object_as_sendAndLoad (SwfdecAsContext *cx, SwfdecAsObject *object,
   SwfdecAsValue val;
   SwfdecBuffer *buffer;
 
-  SWFDEC_AS_CHECK (SWFDEC_TYPE_AS_OBJECT, &object, "sO|s", &url, &target,
+  SWFDEC_AS_CHECK (SWFDEC_TYPE_AS_OBJECT, &object, "so|s", &url, &target,
       &method);
 
   SWFDEC_AS_VALUE_SET_OBJECT (&val, object);