AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

a11y: Be a bit safer against crashes

Browse Source 
We are collecting values from varargs and use them
as indices into static arrays. We should at least
do some bounds checking to prevent silly crashes.
This commit is contained in:
Matthias Clasen 2020-07-27 00:21:01 -04:00
parent 2ce6ac00cf
commit 4c5df54e39
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkaccessiblevalue.c
View File

@ -904,6 +904,8 @@ gtk_accessible_value_get_default_for_state (GtkAccessibleState state)
{
const GtkAccessibleCollect *cstate = &collect_states[state];
g_return_val_if_fail (state <= GTK_ACCESSIBLE_STATE_SELECTED, NULL);
switch (cstate->value)
{
case GTK_ACCESSIBLE_STATE_BUSY:
@ -1240,6 +1242,8 @@ gtk_accessible_value_collect_for_state (GtkAccessibleState state,
{
const GtkAccessibleCollect *cstate = &collect_states[state];
g_return_val_if_fail (state <= GTK_ACCESSIBLE_STATE_SELECTED, NULL);
return gtk_accessible_value_collect_valist (cstate, args);
}
@ -1259,6 +1263,8 @@ gtk_accessible_value_collect_for_state_value (GtkAccessibleState state,
{
const GtkAccessibleCollect *cstate = &collect_states[state];
g_return_val_if_fail (state <= GTK_ACCESSIBLE_STATE_SELECTED, NULL);
return gtk_accessible_value_collect_value (cstate, value);
}
@ -1276,6 +1282,8 @@ gtk_accessible_value_get_default_for_property (GtkAccessibleProperty property)
{
const GtkAccessibleCollect *cstate = &collect_props[property];
g_return_val_if_fail (property <= GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT, NULL);
switch (cstate->value)
{
/* Boolean properties */
@ -1340,6 +1348,8 @@ gtk_accessible_value_collect_for_property (GtkAccessibleProperty property,
{
const GtkAccessibleCollect *cstate = &collect_props[property];
g_return_val_if_fail (property <= GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT, NULL);
return gtk_accessible_value_collect_valist (cstate, args);
}
@ -1359,6 +1369,8 @@ gtk_accessible_value_collect_for_property_value (GtkAccessibleProperty property
{
const GtkAccessibleCollect *cstate = &collect_props[property];
g_return_val_if_fail (property <= GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT, NULL);
return gtk_accessible_value_collect_value (cstate, value);
}
@ -1376,6 +1388,8 @@ gtk_accessible_value_get_default_for_relation (GtkAccessibleRelation relation)
{
const GtkAccessibleCollect *cstate = &collect_rels[relation];
g_return_val_if_fail (relation <= GTK_ACCESSIBLE_RELATION_SET_SIZE, NULL);
switch (cstate->value)
{
/* References */
@ -1429,6 +1443,8 @@ gtk_accessible_value_collect_for_relation (GtkAccessibleRelation relation,
{
const GtkAccessibleCollect *cstate = &collect_rels[relation];
g_return_val_if_fail (relation <= GTK_ACCESSIBLE_RELATION_SET_SIZE, NULL);
return gtk_accessible_value_collect_valist (cstate, args);
}
@ -1448,6 +1464,8 @@ gtk_accessible_value_collect_for_relation_value (GtkAccessibleRelation relation
{
const GtkAccessibleCollect *cstate = &collect_rels[relation];
g_return_val_if_fail (relation <= GTK_ACCESSIBLE_RELATION_SET_SIZE, NULL);
return gtk_accessible_value_collect_value (cstate, value);
}

7
gtk/gtkaccessiblevaluestatic.c
View File

@ -189,6 +189,9 @@ static GtkTristateAccessibleValue tristate_values[] = {
GtkAccessibleValue *
gtk_tristate_accessible_value_new (GtkAccessibleTristate value)
{
g_return_val_if_fail (value >= GTK_ACCESSIBLE_TRISTATE_FALSE &&
value <= GTK_ACCESSIBLE_TRISTATE_MIXED, NULL);
return gtk_accessible_value_ref ((GtkAccessibleValue *) &tristate_values[value]);
}
@ -344,6 +347,10 @@ static GtkTokenAccessibleValue orientation_values[] = {
GtkAccessibleValue *
gtk_orientation_accessible_value_new (GtkOrientation value)
{
g_return_val_if_fail (value >= GTK_ORIENTATION_HORIZONTAL &&
value <= GTK_ORIENTATION_VERTICAL,
NULL);
return gtk_accessible_value_ref ((GtkAccessibleValue *) &orientation_values[value]);
}