diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2021-02-15 22:57:42 +0200 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2021-02-15 22:57:42 +0200 |
| commit | a354125d7d9f07860d2d9a629eee2e108fbfe25e (patch) | |
| tree | 15b19f58f7bb5925ba1b479b138df4461d7d6229 /scene/resources/text_paragraph.cpp | |
| parent | a59286f0198c7a3141fc9a8af4d458c7dcfbf653 (diff) | |
| download | redot-engine-a354125d7d9f07860d2d9a629eee2e108fbfe25e.tar.gz | |
Fix `TextLine`/`TextParagraph` crash when `add_string` / `set_dropcap` is called null font reference.
Diffstat (limited to 'scene/resources/text_paragraph.cpp')
| -rw-r--r-- | scene/resources/text_paragraph.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/resources/text_paragraph.cpp b/scene/resources/text_paragraph.cpp index 94957df510..444a4bb22a 100644 --- a/scene/resources/text_paragraph.cpp +++ b/scene/resources/text_paragraph.cpp @@ -243,6 +243,7 @@ TextServer::Orientation TextParagraph::get_orientation() const { } bool TextParagraph::set_dropcap(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Rect2 &p_dropcap_margins, const Dictionary &p_opentype_features, const String &p_language) { + ERR_FAIL_COND_V(p_fonts.is_null(), false); TS->shaped_text_clear(dropcap_rid); dropcap_margins = p_dropcap_margins; bool res = TS->shaped_text_add_string(dropcap_rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language); @@ -257,6 +258,7 @@ void TextParagraph::clear_dropcap() { } bool TextParagraph::add_string(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language) { + ERR_FAIL_COND_V(p_fonts.is_null(), false); bool res = TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language); spacing_top = p_fonts->get_spacing(Font::SPACING_TOP); spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM); |