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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/13 19:11:20

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 

Log message:
        (find_target): "/" is the root.  Fixes bug #21572.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4847&r2=1.4848
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.106&r2=1.107

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4847
retrieving revision 1.4848
diff -u -b -r1.4847 -r1.4848
--- ChangeLog   13 Nov 2007 13:47:27 -0000      1.4847
+++ ChangeLog   13 Nov 2007 19:11:20 -0000      1.4848
@@ -1,5 +1,10 @@
 2007-11-13 Sandro Santilli <address@hidden>
 
+       * server/as_environment.cpp (find_target): "/" is the root.
+         Fixes bug #21572.
+
+2007-11-13 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/registerClassTest.c: add test for the 
          return code of registerClass.
 

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- server/as_environment.cpp   8 Nov 2007 23:20:37 -0000       1.106
+++ server/as_environment.cpp   13 Nov 2007 19:11:20 -0000      1.107
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.106 2007/11/08 23:20:37 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.107 2007/11/13 19:11:20 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -546,11 +546,21 @@
     const char*        p = path.c_str();
     if (*p == '/') {
        // Absolute path.  Start at the root.
-       env = m_target->get_root_movie();
+       sprite_instance* root = m_target->get_root_movie();
+       if ( ! *(++p) )
+       {
+#ifdef DEBUG_TARGET_FINDING 
+               log_msg(_("Path is '/', return the root (%p)"), (void*)root);
+#endif
+               return root; // that's all folks.. 
+       }
+
+       env = root;
+
 #ifdef DEBUG_TARGET_FINDING 
        log_msg(_("Absolute path, start at the root (%p)"), (void*)env);
 #endif
-       p++;
+
     }
 #ifdef DEBUG_TARGET_FINDING 
     else
@@ -559,12 +569,7 @@
     }
 #endif
     
-    if (*p == '\0') {
-#ifdef DEBUG_TARGET_FINDING 
-       log_msg(_("Null path, returning m_target"));
-#endif
-       return m_target;
-    }
+    assert (*p);
 
     std::string        subpart;
     while (env)