From e81a96fb535c44d1f3c7fbad1b9196a47cf19a1a Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 6 Aug 2004 21:16:03 +0000
Subject: [project @ 2004-08-06 21:16:03 by jmb] Fix bug in merging of selector
 lists

svn path=/import/netsurf/; revision=1186
---
 css/css.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'css')

diff --git a/css/css.c b/css/css.c
index 7b2656cdc..c4bbb8025 100644
--- a/css/css.c
+++ b/css/css.c
@@ -799,7 +799,8 @@ bool css_merge_rule_lists_internal(struct css_selector *l1, struct css_selector
 			/** \todo warn user? */
 			return false;
 
-		if (a->specificity < b->specificity) {
+		if ((a && b && a->specificity < b->specificity) ||
+		    (a && !b)) {
 			entry = memcpy(entry, a, sizeof(*entry));
 			a = a->next;
 		}
-- 
cgit v1.2.3