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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/20 23:10:02

Modified files:
        .              : ChangeLog 
        server         : as_value.cpp 

Log message:
                * server/as_value.cpp (to_sprite): don't segfault if the
                  sprite path doesn't reference an existing target.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1981&r2=1.1982
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1981
retrieving revision 1.1982
diff -u -b -r1.1981 -r1.1982
--- ChangeLog   20 Dec 2006 20:09:07 -0000      1.1981
+++ ChangeLog   20 Dec 2006 23:10:02 -0000      1.1982
@@ -1,5 +1,7 @@
 2006-12-20 Sandro Santilli <address@hidden>
 
+       * server/as_value.cpp (to_sprite): don't segfault if the
+         sprite path doesn't reference an existing target.
        * testsuite/samples/clip_as_button2-TestRunner.cpp:
          handled failures of MovieTester initialization
          (see bug #18567).

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/as_value.cpp 20 Dec 2006 15:56:02 -0000      1.14
+++ server/as_value.cpp 20 Dec 2006 23:10:02 -0000      1.15
@@ -365,7 +365,17 @@
        as_environment& env = root->get_environment();
        // TODO: simplify next statement when m_string_value will become a 
std::string
        character* target = 
env.find_target(std::string(m_string_value.c_str()));
+       if ( ! target )
+       {
+               log_warning("MovieClip value is a dangling reference: "
+                               "target '%s' not found (should set to NULL?)",
+                               m_string_value.c_str());
+               return NULL;
+       }
+       else
+       {
        return target->to_movie();
+       }
 }
 
 void