os.font: fixes for -os android

spytheman · spytheman · commit 131449e70dc7 · 2025-06-18T16:38:40.000+03:00
diff --git a/vlib/os/font/font.v b/vlib/os/font/font.v
@@ -57,24 +57,31 @@ pub fn default() string {
 			if os.is_file(xml_file) && os.is_readable(xml_file) {
 				xml := os.read_file(xml_file) or { continue }
 				lines := xml.split('\n')
-				unsafe { xml.free() }
 				mut candidate_font := ''
 				for line in lines {
 					if line.contains('<font') {
-						candidate_font = line.all_after('>').all_before('<').trim(' \n\t\r')
+						tmp1 := line.all_after('>')
+						tmp2 := tmp1.all_before('<')
+						tmp3 := tmp2.trim(' \n\t\r')
+						mut_assign(candidate_font, tmp3)
 						if candidate_font.contains('.ttf') {
 							for location in font_locations {
-								candidate_path := os.join_path(location, candidate_font)
+								candidate_path := os.join_path_single(location, candidate_font)
 								if os.is_file(candidate_path) && os.is_readable(candidate_path) {
 									debug_font_println('Using font "${candidate_path}"')
 									return candidate_path
 								}
 								unsafe { candidate_path.free() }
 							}
 						}
+						unsafe { tmp3.free() }
+						unsafe { tmp2.free() }
+						unsafe { tmp1.free() }
 					}
 				}
 				unsafe { candidate_font.free() }
+				unsafe { lines.free() }
+				unsafe { xml.free() }
 			}
 		}
 		unsafe { font_locations.free() }
@@ -157,6 +164,7 @@ pub fn get_path_variant(font_path string, variant Variant) string {
 	return res
 }
 
+@[manualfree]
 fn mut_replace(s &string, find string, replacement string) {
 	new := (*s).replace(find, replacement)
 	unsafe { s.free() }
@@ -165,6 +173,7 @@ fn mut_replace(s &string, find string, replacement string) {
 	}
 }
 
+@[manualfree]
 fn mut_plus(s &string, tail string) {
 	new := (*s) + tail
 	unsafe { s.free() }
@@ -173,6 +182,7 @@ fn mut_plus(s &string, tail string) {
 	}
 }
 
+@[manualfree]
 fn mut_assign(s &string, value string) {
 	unsafe { s.free() }
 	unsafe {

Original file line number	Diff line number	Diff line change
`@@ -57,24 +57,31 @@ pub fn default() string {`
`57`	`57`	`if os.is_file(xml_file) && os.is_readable(xml_file) {`
`58`	`58`	`xml := os.read_file(xml_file) or { continue }`
`59`	`59`	`lines := xml.split('\n')`
`60`		`- unsafe { xml.free() }`
`61`	`60`	`mut candidate_font := ''`
`62`	`61`	`for line in lines {`
`63`	`62`	`if line.contains('<font') {`
`64`		`- candidate_font = line.all_after('>').all_before('<').trim(' \n\t\r')`
	`63`	`+ tmp1 := line.all_after('>')`
	`64`	`+ tmp2 := tmp1.all_before('<')`
	`65`	`+ tmp3 := tmp2.trim(' \n\t\r')`
	`66`	`+ mut_assign(candidate_font, tmp3)`
`65`	`67`	`if candidate_font.contains('.ttf') {`
`66`	`68`	`for location in font_locations {`
`67`		`- candidate_path := os.join_path(location, candidate_font)`
	`69`	`+ candidate_path := os.join_path_single(location, candidate_font)`
`68`	`70`	`if os.is_file(candidate_path) && os.is_readable(candidate_path) {`
`69`	`71`	`debug_font_println('Using font "${candidate_path}"')`
`70`	`72`	`return candidate_path`
`71`	`73`	`}`
`72`	`74`	`unsafe { candidate_path.free() }`
`73`	`75`	`}`
`74`	`76`	`}`
	`77`	`+ unsafe { tmp3.free() }`
	`78`	`+ unsafe { tmp2.free() }`
	`79`	`+ unsafe { tmp1.free() }`
`75`	`80`	`}`
`76`	`81`	`}`
`77`	`82`	`unsafe { candidate_font.free() }`
	`83`	`+ unsafe { lines.free() }`
	`84`	`+ unsafe { xml.free() }`
`78`	`85`	`}`
`79`	`86`	`}`
`80`	`87`	`unsafe { font_locations.free() }`
`@@ -157,6 +164,7 @@ pub fn get_path_variant(font_path string, variant Variant) string {`
`157`	`164`	`return res`
`158`	`165`	`}`
`159`	`166`
	`167`	`+@[manualfree]`
`160`	`168`	`fn mut_replace(s &string, find string, replacement string) {`
`161`	`169`	`new := (*s).replace(find, replacement)`
`162`	`170`	`unsafe { s.free() }`
`@@ -165,6 +173,7 @@ fn mut_replace(s &string, find string, replacement string) {`
`165`	`173`	`}`
`166`	`174`	`}`
`167`	`175`
	`176`	`+@[manualfree]`
`168`	`177`	`fn mut_plus(s &string, tail string) {`
`169`	`178`	`new := (*s) + tail`
`170`	`179`	`unsafe { s.free() }`
`@@ -173,6 +182,7 @@ fn mut_plus(s &string, tail string) {`
`173`	`182`	`}`
`174`	`183`	`}`
`175`	`184`
	`185`	`+@[manualfree]`
`176`	`186`	`fn mut_assign(s &string, value string) {`
`177`	`187`	`unsafe { s.free() }`
`178`	`188`	`unsafe {`