From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 10 Oct 2019 18:42:00 +0000 (+0200)
Subject: glib-2.0: Guard against passing null source to GLib.Memory.copy()
X-Git-Tag: 0.47.1~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5024c64c833130a7c6179bf67ba7622ffe9d2405;p=thirdparty%2Fvala.git

glib-2.0: Guard against passing null source to GLib.Memory.copy()

Found by -fsanitize=undefined
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index d5229327d..7e8cfab81 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1465,8 +1465,10 @@ public class string {
 		GLib.Memory.copy (dest, this, start);
 		dest += start;
 
-		GLib.Memory.copy (dest, str, str_size);
-		dest += str_size;
+		if (str != null) {
+			GLib.Memory.copy (dest, str, str_size);
+			dest += str_size;
+		}
 
 		GLib.Memory.copy (dest, (char*) this + end, string_length - end);