[gtk: 2/2] Merge branch 'wip/otte/for-master' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 2ba69abe39124072fa7370b8e038ac6b7212e8a3
Merge: a663b8c313 a76f515569
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Fri Jul 16 16:26:23 2021 +0000

    Merge branch 'wip/otte/for-master' into 'master'
    
    cssimagecrossfade: Don't abort() when failing to parse image
    
    Closes #4101
    
    See merge request GNOME/gtk!3758

 gtk/gtkcssimagecrossfade.c                         | 16 +++++++++++-----
 testsuite/css/parser/cross-fade-crash-4101.css     |  3 +++
 testsuite/css/parser/cross-fade-crash-4101.errors  |  1 +
 testsuite/css/parser/cross-fade-crash-4101.ref.css |  0
 testsuite/css/parser/meson.build                   |  3 +++
 5 files changed, 18 insertions(+), 5 deletions(-)
---