luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 16:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/gptrarray-null-term' into 'main'

Browse Source 
garray: Update NULL termination after copying array content

Closes #2877

See merge request GNOME/glib!3190
This commit is contained in:
Simon McVittie 2023-01-10 19:51:57 +00:00
commit 1955497993
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/garray.c
View File

@ -1387,6 +1387,9 @@ ptr_array_new_from_array (gpointer *data,
memcpy (rarray->pdata, data, len * sizeof (gpointer)); memcpy (rarray->pdata, data, len * sizeof (gpointer));
} }
if (null_terminated && rarray->pdata != NULL)
rarray->pdata[len] = NULL;
rarray->len = len; rarray->len = len;
return array; return array;