diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2023-01-10 19:51:57 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2023-01-10 19:51:57 +0000 |
| commit | 19554979939bb3bcc0dd3e24cf7e898cb8450a61 (patch) | |
| tree | fb4f4180fcc8615c826ce082f1ffa987a225b440 | |
| parent | 71f0b3b5eaa85f89f64874e72679f0175c460977 (diff) | |
| parent | 68b9fd53ec4265cf45848957c9a2e04f59396fa4 (diff) | |
| download | glib-19554979939bb3bcc0dd3e24cf7e898cb8450a61.tar.gz | |
Merge branch 'wip/smcv/gptrarray-null-term' into 'main'
garray: Update NULL termination after copying array content
Closes #2877
See merge request GNOME/glib!3190
| -rw-r--r-- | glib/garray.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/glib/garray.c b/glib/garray.c index a82e432df..118360ca1 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -1387,6 +1387,9 @@ ptr_array_new_from_array (gpointer *data, memcpy (rarray->pdata, data, len * sizeof (gpointer)); } + if (null_terminated && rarray->pdata != NULL) + rarray->pdata[len] = NULL; + rarray->len = len; return array; |