gtkhtml r8880 - branches/gnome-2-22/gtkhtml

[msuman svn gnome org]

Author: msuman
Date: Mon Jun 30 03:32:14 2008
New Revision: 8880
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8880&view=rev

Log:
Patch from Milan Crha  <mcrha redhat com> ** Fix for bug #540342 (Fix for a vulnerability issue).

Modified:
   branches/gnome-2-22/gtkhtml/ChangeLog
   branches/gnome-2-22/gtkhtml/gtkhtml.c
   branches/gnome-2-22/gtkhtml/htmlframeset.h

Modified: branches/gnome-2-22/gtkhtml/gtkhtml.c
==============================================================================
--- branches/gnome-2-22/gtkhtml/gtkhtml.c	(original)
+++ branches/gnome-2-22/gtkhtml/gtkhtml.c	Mon Jun 30 03:32:14 2008
@@ -53,6 +53,7 @@
 #include "htmlengine-save.h"
 #include "htmlform.h"
 #include "htmlframe.h"
+#include "htmlframeset.h"
 #include "htmliframe.h"
 #include "htmlimage.h"
 #include "htmlinterval.h"
@@ -5813,6 +5814,10 @@
 	    GTK_HTML (GTK_HTML (HTML_FRAME (o)->html)->iframe_parent)->iframe_parent == NULL)
 		gtk_html_set_iframe_parent (GTK_HTML (HTML_FRAME (o)->html), data, o);
 
+	if (HTML_IS_FRAMESET (o) && HTML_FRAMESET (o)->parent && 
+	    HTML_FRAMESET (o)->parent->iframe_parent == NULL) {
+		HTML_FRAMESET (o)->parent = data;
+	}
 }
 
 static void

Modified: branches/gnome-2-22/gtkhtml/htmlframeset.h
==============================================================================
--- branches/gnome-2-22/gtkhtml/htmlframeset.h	(original)
+++ branches/gnome-2-22/gtkhtml/htmlframeset.h	Mon Jun 30 03:32:14 2008
@@ -25,6 +25,7 @@
 #include "htmlobject.h"
 #define HTML_FRAMESET(x) ((HTMLFrameset *)(x))
 #define HTML_FRAMESET_CLASS(x) ((HTMLFramesetClass *)(x))
+#define HTML_IS_FRAMESET(x) (HTML_CHECK_TYPE ((x), HTML_TYPE_FRAMESET))
 
 struct _HTMLFrameset {
 	HTMLObject object;
@@ -48,9 +49,3 @@
 gboolean      html_frameset_append     (HTMLFrameset *set, HTMLObject *o);
 void          html_frameset_type_init  (void);
 #endif /* _HTMLTABLE_H_ */
-
-
-
-
-
-