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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/06/28 11:57:37

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 

Log message:
        * server/as_environment.cpp (find_target): assert that an as_value of 
type OBJECT can be cast to an object.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.435&r2=1.436
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -b -r1.435 -r1.436
--- ChangeLog   28 Jun 2006 01:00:04 -0000      1.435
+++ ChangeLog   28 Jun 2006 11:57:37 -0000      1.436
@@ -1,5 +1,7 @@
 2006-06-28 Sandro Santilli <address@hidden>
 
+       * server/as_environment.cpp (find_target): assert that
+       an as_value of type OBJECT can be cast to an object.
        * server/Makefile.am, server/character_def.cpp, server/impl.cpp:
        Put character_def implementation in its own file.
        * server/character_def.h: Added missing forward declarations.

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/as_environment.cpp   21 Jun 2006 23:06:41 -0000      1.4
+++ server/as_environment.cpp   28 Jun 2006 11:57:37 -0000      1.5
@@ -392,16 +392,19 @@
 movie*
 as_environment::find_target(const as_value& val) const
 {
-    if (val.get_type() == as_value::OBJECT) {
-       if (val.to_object() != NULL) {
+       if (val.get_type() == as_value::OBJECT)
+       {
+               assert (val.to_object() != NULL);
            return val.to_object()->to_movie();
-       } else {
-           return NULL;
        }
-    } else if (val.get_type() == as_value::STRING) {
+       else if (val.get_type() == as_value::STRING)
+       {
        return find_target(val.to_tu_string());
-    } else {
-       log_error("error: invalid path; neither string nor object");
+       }
+       else
+       {
+               log_error("error: %s: invalid path; neither string nor object",
+                       val.to_string());
        return NULL;
     }
 }