Commit 64a2d022 authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'lsan-leaks-2' into 'master'

Lsan leaks 2

See merge request !3106
parents 341efe9a 0ef91c3b
Pipeline #249401 passed with stages
in 34 minutes and 48 seconds
......@@ -8,7 +8,7 @@ builddir=$1
backend=$2
# Ignore memory leaks lower in dependencies
export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp
export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0
export G_SLICE=always-malloc
case "${backend}" in
......
......@@ -991,6 +991,7 @@ gtk_gesture_set_sequence_state (GtkGesture *gesture,
{
GtkGesturePrivate *priv;
PointData *data;
GtkEventSequenceState current_state;
g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE);
g_return_val_if_fail (state >= GTK_EVENT_SEQUENCE_NONE &&
......@@ -1014,11 +1015,13 @@ gtk_gesture_set_sequence_state (GtkGesture *gesture,
data->state != GTK_EVENT_SEQUENCE_NONE)
return FALSE;
current_state = data->state;
data->state = state;
if (state == GTK_EVENT_SEQUENCE_DENIED &&
data->state == GTK_EVENT_SEQUENCE_CLAIMED)
current_state == GTK_EVENT_SEQUENCE_CLAIMED)
_gtk_gesture_cancel_sequence (gesture, sequence);
data->state = state;
gtk_widget_cancel_event_sequence (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)),
gesture, sequence, state);
g_signal_emit (gesture, signals[SEQUENCE_STATE_CHANGED], 0,
......
......@@ -164,7 +164,7 @@ languages_parse_start_tag (GMarkupParseContext *ctx,
for (i = 0; i < G_N_ELEMENTS (long_names); i++)
{
if (g_str_has_prefix (display_name, long_names[i]))
display_name[strlen (long_names[i]) + 1] = '\0';
display_name[strlen (long_names[i])] = '\0';
}
......
......@@ -4,6 +4,6 @@ leak:libfontconfig.so
leak:libEGL_mesa.so
leak:iris_dri.so
leak:libglib-2.0.so
leak:libgio-2.0.so
leak:libcairo.so
leak:libpixman-1.so
leak:libatk-bridge-2.0.so
......@@ -100,6 +100,8 @@ gdk_array(test_splice) (void)
sum -= gdk_array(get) (&v, i);
}
g_assert_cmpint (sum, ==, 0);
gdk_array(clear) (&v);
}
#undef _T_
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment