Skip to content

Commit

Permalink
Update fuzzer projects. Fix cyclic TLBitmapFont load calls [fuzz].
Browse files Browse the repository at this point in the history
  • Loading branch information
@bruvzg
bruvzg committed Oct 31, 2019
1 parent fc1020f commit dac3c91
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 25 deletions.
23 changes: 12 additions & 11 deletions demos/fuzzer_builtin/main.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ script/source = "extends Control

const FileList = [\"\", \"gqergerth45y245hygn\", \"AwamiNastaliq-Regular.ttf\", \"Montserrat-BlackItalic.ttf\", \"NotoNaskhArabicUI.fnt\", \"NotoSans-Regular.ttf\", \"ComicNeue-Bold.otf\", \"Montserrat-Italic.ttf\", \"NotoNaskhArabicUI_0.png\", \"NotoSansRegular.fnt\", \"ComicNeue-BoldOblique.otf\", \"Montserrat-Regular.ttf\", \"NotoNaskhArabicUI_0.png.import\", \"NotoSansRegular_0.png\", \"ComicNeue-Oblique.otf\", \"NotoColorEmoji-subset.ttf\", \"NotoNastaliqUrdu-Regular.ttf\", \"NotoSansRegular_0.png.import\", \"ComicNeue-Regular.otf\", \"NotoFull\", \"NotoSans-Bold.ttf\", \"NotoSansThai-Bold.ttf\", \"LICENSE_OFL.txt\", \"NotoNaskhArabic-Bold.ttf\", \"NotoSans-BoldItalic.ttf\", \"NotoSerifThai-Regular.ttf\", \"Montserrat-Black.ttf\", \"NotoNaskhArabic-Regular.ttf\", \"NotoSans-Italic.ttf\"]

var RANGE : int = 65000
var tooo = -10
var RANGE : int = 650001
var tooo = -2

func _ready():
randomize()
Expand All @@ -23,9 +23,10 @@ func _randstr():
return _randintarray().get_string_from_utf8()

func _process(delta):
if (tooo < 0):
OS.set_window_title(\"Run: \" + str(tooo))
tooo = tooo + 1
if (tooo <= 0):
#skip some frames
tooo = tooo + 1
update()
else:
_fuzz_tlshapedparagraph()
Expand All @@ -34,7 +35,7 @@ func _fuzz_tlshapedparagraph():
var para1 = TLShapedParagraph.new()
var para2 = TLShapedParagraph.new()

for i in range(10):
for i in range(2):
if randi() % 6 == 0:
para1.copy_properties(para2)

Expand Down Expand Up @@ -87,7 +88,7 @@ func _fuzz_tlattributedshapedstring():
var str1 = TLShapedAttributedString.new()
var str2 = TLShapedAttributedString.new()

for i in range(10):
for i in range(2):
if randi() % 6 == 0:
str1.add_attribute(randi() % RANGE - RANGE / 2, _randintarray(), randi() % RANGE - RANGE / 2, randi() % RANGE - RANGE / 2)
if randi() % 2 == 0:
Expand Down Expand Up @@ -232,7 +233,7 @@ func _fuzz_tlshapedstring():
var str1 = TLShapedString.new()
var str2 = TLShapedString.new()

for i in range(10):
for i in range(2):
if randi() % 3 == 0:
str1.copy_properties(str2)
if randi() % 3 == 0:
Expand Down Expand Up @@ -352,7 +353,7 @@ func _fuzz_tlshapedstring():

func _fuzz_tlfontfamily():
var fam = TLFontFamily.new()
for i in range(10):
for i in range(2):
var s = _randstr()
if randi() % 3 == 0:
s = \"Regular\"
Expand Down Expand Up @@ -400,7 +401,7 @@ func _fuzz_tlfontface():
if f != FileList.size():
face1.load(\"res://fonts/\" + FileList[f])

for i in range(10):
for i in range(2):
face1.draw_glyph(get_canvas_item(), Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, Color(randf(),randf(),randf(),randf()), randf() * 256)
face1.draw_glyph_outline(get_canvas_item(), Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, Color(randf(),randf(),randf(),randf()), randf() * 256)
face1.get_glyph_outline(Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, randf() * 256)
Expand All @@ -426,7 +427,7 @@ func _fuzz_tlbitmapfontface():
if f != FileList.size():
face1.load(\"res://fonts/\" + FileList[f])

for i in range(10):
for i in range(2):
face1.draw_glyph(get_canvas_item(), Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, Color(randf(),randf(),randf(),randf()), randf() * 256)
face1.draw_glyph_outline(get_canvas_item(), Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, Color(randf(),randf(),randf(),randf()), randf() * 256)
face1.get_glyph_outline(Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, randf() * 256)
Expand All @@ -452,7 +453,7 @@ func _fuzz_tldynamicfontface():
if f != FileList.size():
face1.load(\"res://fonts/\" + FileList[f])

for i in range(10):
for i in range(2):
if randi() % 3 == 0:
face1.set_force_autohinter(bool(randi()%2))
face1.get_force_autohinter()
Expand Down
23 changes: 12 additions & 11 deletions demos/fuzzer_gdnative/main.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ const TLConstants = preload(\"res://addons/libgdtl/constants.gd\")

const FileList = [\"\", \"gqergerth45y245hygn\", \"AwamiNastaliq-Regular.ttf\", \"Montserrat-BlackItalic.ttf\", \"NotoNaskhArabicUI.fnt\", \"NotoSans-Regular.ttf\", \"ComicNeue-Bold.otf\", \"Montserrat-Italic.ttf\", \"NotoNaskhArabicUI_0.png\", \"NotoSansRegular.fnt\", \"ComicNeue-BoldOblique.otf\", \"Montserrat-Regular.ttf\", \"NotoNaskhArabicUI_0.png.import\", \"NotoSansRegular_0.png\", \"ComicNeue-Oblique.otf\", \"NotoColorEmoji-subset.ttf\", \"NotoNastaliqUrdu-Regular.ttf\", \"NotoSansRegular_0.png.import\", \"ComicNeue-Regular.otf\", \"NotoFull\", \"NotoSans-Bold.ttf\", \"NotoSansThai-Bold.ttf\", \"LICENSE_OFL.txt\", \"NotoNaskhArabic-Bold.ttf\", \"NotoSans-BoldItalic.ttf\", \"NotoSerifThai-Regular.ttf\", \"Montserrat-Black.ttf\", \"NotoNaskhArabic-Regular.ttf\", \"NotoSans-Italic.ttf\"]

var RANGE : int = 65000
var tooo = -10
var RANGE : int = 650001
var tooo = -2

func _ready():
randomize()
Expand All @@ -33,9 +33,10 @@ func _randstr():
return _randintarray().get_string_from_utf8()

func _process(delta):
if (tooo < 0):
OS.set_window_title(\"Run: \" + str(tooo))
tooo = tooo + 1
if (tooo <= 0):
#skip some frames
tooo = tooo + 1
update()
else:
_fuzz_tlshapedparagraph()
Expand All @@ -44,7 +45,7 @@ func _fuzz_tlshapedparagraph():
var para1 = TLShapedParagraph.new()
var para2 = TLShapedParagraph.new()

for i in range(10):
for i in range(2):
if randi() % 6 == 0:
para1.copy_properties(para2)

Expand Down Expand Up @@ -97,7 +98,7 @@ func _fuzz_tlattributedshapedstring():
var str1 = TLShapedAttributedString.new()
var str2 = TLShapedAttributedString.new()

for i in range(10):
for i in range(2):
if randi() % 6 == 0:
str1.add_attribute(randi() % RANGE - RANGE / 2, _randintarray(), randi() % RANGE - RANGE / 2, randi() % RANGE - RANGE / 2)
if randi() % 2 == 0:
Expand Down Expand Up @@ -242,7 +243,7 @@ func _fuzz_tlshapedstring():
var str1 = TLShapedString.new()
var str2 = TLShapedString.new()

for i in range(10):
for i in range(2):
if randi() % 3 == 0:
str1.copy_properties(str2)
if randi() % 3 == 0:
Expand Down Expand Up @@ -362,7 +363,7 @@ func _fuzz_tlshapedstring():

func _fuzz_tlfontfamily():
var fam = TLFontFamily.new()
for i in range(10):
for i in range(2):
var s = _randstr()
if randi() % 3 == 0:
s = \"Regular\"
Expand Down Expand Up @@ -410,7 +411,7 @@ func _fuzz_tlfontface():
if f != FileList.size():
face1.load(\"res://fonts/\" + FileList[f])

for i in range(10):
for i in range(2):
face1.draw_glyph(get_canvas_item(), Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, Color(randf(),randf(),randf(),randf()), randf() * 256)
face1.draw_glyph_outline(get_canvas_item(), Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, Color(randf(),randf(),randf(),randf()), randf() * 256)
face1.get_glyph_outline(Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, randf() * 256)
Expand All @@ -436,7 +437,7 @@ func _fuzz_tlbitmapfontface():
if f != FileList.size():
face1.load(\"res://fonts/\" + FileList[f])

for i in range(10):
for i in range(2):
face1.draw_glyph(get_canvas_item(), Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, Color(randf(),randf(),randf(),randf()), randf() * 256)
face1.draw_glyph_outline(get_canvas_item(), Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, Color(randf(),randf(),randf(),randf()), randf() * 256)
face1.get_glyph_outline(Vector2(randf(),randf()), randi() % RANGE - RANGE / 2, randf() * 256)
Expand All @@ -462,7 +463,7 @@ func _fuzz_tldynamicfontface():
if f != FileList.size():
face1.load(\"res://fonts/\" + FileList[f])

for i in range(10):
for i in range(2):
if randi() % 3 == 0:
face1.set_force_autohinter(bool(randi()%2))
face1.get_force_autohinter()
Expand Down
6 changes: 3 additions & 3 deletions src/resources/tl_bitmap_font.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,18 +354,18 @@ void TLBitmapFontFace::set_font_path(String p_resource_path) {
bool TLBitmapFontFace::load(String p_resource_path) {

path = p_resource_path;
bool was_loaded = loaded;
if (loaded) {
//unload existing
clear_cache();

loaded = false;
}

Ref<File> file;
file.instance();
if (file->open(p_resource_path, File::READ) != Error::OK) {
ERR_PRINTS("Can't open bitmap font file: \"" + p_resource_path + "\"");
emit_signal(_CHANGED);
if (was_loaded) emit_signal(_CHANGED); //Only emit when old valid font is unloaded during this call, to prevent cyclic calls
return false;
}

Expand Down Expand Up @@ -435,7 +435,7 @@ bool TLBitmapFontFace::load(String p_resource_path) {
ERR_PRINTS("Can't load bitmap font texture: \"" + file_name + "\"");
clear_cache();
file->close();
emit_signal(_CHANGED);
if (was_loaded) emit_signal(_CHANGED);
return false;
} else {
tex->set_flags(txt_flags);
Expand Down

0 comments on commit dac3c91

Please sign in to comment.