[Gnash-commit] gnash server/asobj/xml.cpp ChangeLog

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/01/18 19:38:05

Modified files:
        server/asobj   : xml.cpp 
        .              : ChangeLog 

Log message:
        Make sure we actually have an XMLNode pointer before attempting to clone
        it. Do not attempt to setup a frame unless XML parsing succeeded. Fixes 
bug
        #18746.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2136&r2=1.2137

Patches:
Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/xml.cpp        18 Jan 2007 16:55:35 -0000      1.10
+++ server/asobj/xml.cpp        18 Jan 2007 19:38:05 -0000      1.11
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.10 2007/01/18 16:55:35 strk Exp $ */
+/* $Id: xml.cpp,v 1.11 2007/01/18 19:38:05 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -765,7 +765,7 @@
 {
     log_msg("%s: deep is %d\n", __PRETTY_FUNCTION__, deep);
 
-    if (deep) {
+    if (_nodes && deep) {
        newnode = _nodes;
 //     } else {
 //     newnode.nodeNameSet((char *)_nodes->nodeName());
@@ -1309,9 +1309,10 @@
 
     if (fn.nargs > 0) {
         text = fn.arg(0).to_string(); 
-       ptr->parseXML(text);
+       if (ptr->parseXML(text)) {
        ptr->setupFrame(ptr, ptr->firstChild(), false);  
     }
+    }
     
 #if 1
     if (fn.this_ptr->get_member("onLoad", &method)) {

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2136
retrieving revision 1.2137
diff -u -b -r1.2136 -r1.2137
--- ChangeLog   18 Jan 2007 16:55:35 -0000      1.2136
+++ ChangeLog   18 Jan 2007 19:38:05 -0000      1.2137
@@ -1,3 +1,9 @@
+2007-01-18 Bastiaan Jacques <address@hidden>
+
+       * server/asobj/xml.cpp: Make sure we actually have an XMLNode pointer
+       before attempting to clone it. Do not attempt to setup a frame unless
+       XML parsing succeeded. Fixes bug #18746.
+
 2007-01-18 Sandro Santilli <address@hidden>
 
        * server/asobj/xml.{cpp,h}: third pass of new layout port: