[vala/0.44] glib-2.0: Guard against passing null source to GLib.Memory.copy()
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/0.44] glib-2.0: Guard against passing null source to GLib.Memory.copy()
- Date: Mon, 14 Oct 2019 12:27:36 +0000 (UTC)
commit 1cebd8220f0005d686521cabfda2b3e03637d22a
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Thu Oct 10 20:42:00 2019 +0200
glib-2.0: Guard against passing null source to GLib.Memory.copy()
Found by -fsanitize=undefined
vapi/glib-2.0.vapi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index d4e21ce48..880283ca7 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]