summaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2004-08-06 21:16:03 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2004-08-06 21:16:03 +0000
commite81a96fb535c44d1f3c7fbad1b9196a47cf19a1a (patch)
treea5736d76d7aef67196cefd63475a1ba9443ac6a3 /css
parent1d76b7efaec7f11c7ce3ac927e5659646ffde2d8 (diff)
downloadnetsurf-e81a96fb535c44d1f3c7fbad1b9196a47cf19a1a.tar.gz
netsurf-e81a96fb535c44d1f3c7fbad1b9196a47cf19a1a.tar.bz2
[project @ 2004-08-06 21:16:03 by jmb]
Fix bug in merging of selector lists svn path=/import/netsurf/; revision=1186
Diffstat (limited to 'css')
-rw-r--r--css/css.c3
1 files changed, 2 insertions, 1 deletions
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;
}