gtkhtml2 r1160 - in trunk: . libgtkhtml/layout

[pawels svn gnome org]

Author: pawels
Date: Wed Jul 30 16:59:22 2008
New Revision: 1160
URL: http://svn.gnome.org/viewvc/gtkhtml2?rev=1160&view=rev

Log:
* libgtkhtml/layout/htmlbox.c: check whether parent element exists
  before accessing it.  Fixes #539637


Modified:
   trunk/ChangeLog
   trunk/libgtkhtml/layout/htmlbox.c

Modified: trunk/libgtkhtml/layout/htmlbox.c
==============================================================================
--- trunk/libgtkhtml/layout/htmlbox.c	(original)
+++ trunk/libgtkhtml/layout/htmlbox.c	Wed Jul 30 16:59:22 2008
@@ -303,8 +303,9 @@
 	 */
 	else if (style->surround->margin.left.type != HTML_LENGTH_AUTO &&
 		 style->surround->margin.right.type != HTML_LENGTH_AUTO) {
-
-		if (HTML_BOX_GET_STYLE (html_box_get_containing_block (box))->inherited->direction == HTML_DIRECTION_RTL) {
+		HtmlBox *parent_box = html_box_get_containing_block (box);
+		if (parent_box &&
+		    HTML_BOX_GET_STYLE (box)->inherited->direction == HTML_DIRECTION_RTL) {
 
 			return width - html_length_get_value (&style->box->width, width) -
 				html_box_left_padding (box, width) - html_box_right_padding (box, width) -
@@ -343,8 +344,9 @@
 	 */
 	else if (style->surround->margin.left.type != HTML_LENGTH_AUTO &&
 		 style->surround->margin.right.type != HTML_LENGTH_AUTO) {
-
-		if (HTML_BOX_GET_STYLE (html_box_get_containing_block (box))->inherited->direction == HTML_DIRECTION_LTR) {
+		HtmlBox *parent_box = html_box_get_containing_block (box);
+		if (parent_box &&
+		    HTML_BOX_GET_STYLE (parent_box)->inherited->direction == HTML_DIRECTION_LTR) {
 
 			return width - html_length_get_value (&style->box->width, width) -
 				html_box_left_padding (box, width) - html_box_right_padding (box, width) -