Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/exalm/css-error' into 'master'

Browse Source 
cssselector: Fix max_selector usage

Closes #3100

See merge request GNOME/gtk!3507
This commit is contained in:
Matthias Clasen
2021-05-04 13:17:53 +00:00
parent 670a2be782 f3633d46ca
commit 8d14bd3339
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkcssselector.c
View File

@@ -2102,7 +2102,6 @@ subdivide_infos (GByteArray *array,
guint n_infos,
gint32 parent_offset)
{
const GtkCssSelector *max_selector = NULL;
GtkCssSelectorRuleSetInfo **matched_infos;
guint n_matched = 0;
GtkCssSelectorRuleSetInfo **remaining_infos;
@@ -2110,6 +2109,7 @@ subdivide_infos (GByteArray *array,
GHashTable *ht;
gint32 tree_offset;
GtkCssSelectorTree *tree;
GtkCssSelector max_selector;
GHashTableIter iter;
guint max_count;
gpointer key, value;
@@ -2139,16 +2139,16 @@ subdivide_infos (GByteArray *array,
GtkCssSelector *selector = key;
if (GPOINTER_TO_UINT (value) > max_count ||
(GPOINTER_TO_UINT (value) == max_count &&
gtk_css_selector_compare_one (selector, max_selector) < 0))
gtk_css_selector_compare_one (selector, &max_selector) < 0))
{
max_count = GPOINTER_TO_UINT (value);
max_selector = selector;
max_selector = *selector;
}
}
tree = alloc_tree (array, &tree_offset);
tree->parent_offset = parent_offset;
tree->selector = *max_selector;
tree->selector = max_selector;
/* Allocate maximum for both of them */
/* TODO: Potentially dangerous? */
@@ -2160,9 +2160,9 @@ subdivide_infos (GByteArray *array,
{
GtkCssSelectorRuleSetInfo *info = infos[i];
if (gtk_css_selectors_has_initial_selector (info->current_selector, max_selector))
if (gtk_css_selectors_has_initial_selector (info->current_selector, &max_selector))
{
info->current_selector = gtk_css_selectors_skip_initial_selector (info->current_selector, max_selector);
info->current_selector = gtk_css_selectors_skip_initial_selector (info->current_selector, &max_selector);
if (info->current_selector == NULL)
{
/* Matches current node */