From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 30 Oct 2018 08:00:01 +0000 (+0100)
Subject: glib-2.0: Computing length once is enough in string.to_utf8()/splice()
X-Git-Tag: 0.43.1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=121c89e82e376dbed0959ef9e961ee4fd8bc8a4b;p=thirdparty%2Fvala.git

glib-2.0: Computing length once is enough in string.to_utf8()/splice()
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index e248f42be..ce924a70a 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1455,7 +1455,7 @@ public class string {
 			str_size = ((!)(str)).length;
 		}
 
-		string* result = GLib.malloc0 (this.length - (end - start) + str_size + 1);
+		string* result = GLib.malloc0 (string_length - (end - start) + str_size + 1);
 
 		char* dest = (char*) result;
 
@@ -1503,9 +1503,10 @@ public class string {
 	}
 
 	public char[] to_utf8 () {
-		char[] result = new char[this.length + 1];
+		var string_length = this.length;
+		char[] result = new char[string_length + 1];
 		result.length--;
-		GLib.Memory.copy (result, this, this.length);
+		GLib.Memory.copy (result, this, string_length);
 		return result;
 	}