diff options
| -rw-r--r-- | tests/basic-types/strings.vala | 3 | ||||
| -rw-r--r-- | vapi/glib-2.0.vapi | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/basic-types/strings.vala b/tests/basic-types/strings.vala index 22c96b7f9..31eab55dd 100644 --- a/tests/basic-types/strings.vala +++ b/tests/basic-types/strings.vala @@ -66,6 +66,9 @@ void test_string_joinv () { s = string.joinv ("-", null); assert (s == ""); + s = string.joinv ("-", { null }); + assert (s == ""); + // LeakSanitizer -fsanitize=address sa.length = 3; } diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index 1f70bfd60..5796dc21e 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -1213,7 +1213,7 @@ public class string { len += ((!) separator).length * (i - 1); string* res = GLib.malloc (len); - void* ptr = string.copy_to_buffer ((void*) res, (!) str_array[0]); + void* ptr = string.copy_to_buffer ((void*) res, (str_array[0] != null) ? ((!) str_array[0]) : ""); for (i = 1 ; i < str_array.length ; i++) { ptr = string.copy_to_buffer (ptr, (!) separator); ptr = string.copy_to_buffer (ptr, (str_array[i] != null) ? ((!) str_array[i]) : ""); |