[Gnash-commit] gnash ChangeLog server/MovieClipLoader.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/01 21:46:30

Modified files:
        .              : ChangeLog 
        server         : MovieClipLoader.cpp 

Log message:
        Don't try to load bogus urls

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.457&r2=1.458
http://cvs.savannah.gnu.org/viewcvs/gnash/server/MovieClipLoader.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -b -r1.457 -r1.458
--- ChangeLog   1 Jul 2006 20:44:09 -0000       1.457
+++ ChangeLog   1 Jul 2006 21:46:30 -0000       1.458
@@ -1,4 +1,4 @@
-2006-07-01 Vitaly Alexeev <address@hidden>
+2006-07-02 Sandro Santilli <address@hidden>
 
        * server/MovieClipLoader.cpp, server/action.cpp,
        server/as_environment.cpp, server/as_environment.h,

Index: server/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/MovieClipLoader.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/MovieClipLoader.cpp  1 Jul 2006 20:44:10 -0000       1.25
+++ server/MovieClipLoader.cpp  1 Jul 2006 21:46:30 -0000       1.26
@@ -223,21 +223,19 @@
 
        assert(ptr);
   
-       tu_string tu_url = fn.arg(0).to_string(); 
-#if 0
-       as_object *target_object = fn.arg(1).to_object();
-       if ( ! target_object )
+       as_value& url_arg = fn.arg(0);
+       if ( url_arg.get_type() != as_value::STRING )
        {
-               log_error("load target is not an object.\n");
+               log_error("Malformed SWF, MovieClipLoader.loadClip() first 
argument is not a string (%s)", url_arg.to_string());
                fn.result->set_bool(false);
                return;
        }
 
-       sprite_instance* target = dynamic_cast<sprite_instance*>(target_object);
+       tu_string tu_url = fn.arg(0).to_string(); 
+       sprite_instance* target = fn.env->find_target(fn.arg(1));
        if ( ! target )
        {
-               log_error("load target is not a sprite_instance (%s)\n",
-                       typeid(*target).name());
+               log_error("Could not find target %s", fn.arg(1).to_string());
                fn.result->set_bool(false);
                return;
        }
@@ -246,19 +244,6 @@
                tu_url.c_str(), (void*)target);
 
        // Get a pointer to target's sprite parent (for URL resolution)
-       sprite_instance* parent = target->get_parent();
-       assert(parent);
-#endif
-
-       sprite_instance* target = fn.env->find_target(fn.arg(1));
-       if ( ! target )
-       {
-               log_error("Could not find target %s", fn.arg(1).to_string());
-               fn.result->set_bool(false);
-               return;
-       }
-
-       // Get a pointer to target's sprite parent (for URL resolution)
        character* parent = target->get_parent();
        assert(parent);