diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-06-10 14:02:26 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-10 14:02:26 +0000 |
| commit | b6dc6e05d694bb5a0bd396b5847291ead3a431ea (patch) | |
| tree | 456fd865478d0523c68adf23b448003f6e388590 | |
| parent | e6b03b9f097552829acd7c54ce222c5dc7eb2b65 (diff) | |
| parent | 4c76413df8b68138c9410568388f40ae5430bb13 (diff) | |
| download | pango-b6dc6e05d694bb5a0bd396b5847291ead3a431ea.tar.gz | |
Merge branch 'fix-gtk2-crash' into 'master'
Fix a crash in gtk2
Closes #479
See merge request GNOME/pango!195
| -rw-r--r-- | pango/pango-layout.c | 5 | ||||
| -rw-r--r-- | tests/layouts/valid-3.expected | 1 | ||||
| -rw-r--r-- | tests/layouts/valid-4.expected | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 3c138327..b07c8487 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -689,11 +689,6 @@ pango_layout_set_attributes (PangoLayout *layout, if (!attrs && !layout->attrs) return; - /* Also both empty */ - if (!_pango_attr_list_has_attributes (layout->attrs) && - !_pango_attr_list_has_attributes (attrs)) - return; - if (layout->attrs && pango_attr_list_equal (layout->attrs, attrs)) return; diff --git a/tests/layouts/valid-3.expected b/tests/layouts/valid-3.expected index 7f9d9e2f..247c61bf 100644 --- a/tests/layouts/valid-3.expected +++ b/tests/layouts/valid-3.expected @@ -8,6 +8,7 @@ lines: 2 --- attributes +range 0 2147483647 --- lines diff --git a/tests/layouts/valid-4.expected b/tests/layouts/valid-4.expected index dae4e065..09f143f3 100644 --- a/tests/layouts/valid-4.expected +++ b/tests/layouts/valid-4.expected @@ -9,6 +9,7 @@ width: 194560 --- attributes +range 0 2147483647 --- lines |