keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrader: Fix potential use of NULL value

Browse Source 
Current gcc in Fedora rawhide correctly points out:
```
In function 'generate_initramfs_overlay',
    inlined from 'rpmostree_sysroot_upgrader_deploy' at src/daemon/rpmostree-sysroot-upgrader.c:1604:12:
src/daemon/rpmostree-sysroot-upgrader.c:1166:65: error: argument 1 null where non-null expected [-Werror=nonnull]
 1166 |                                       g_steal_pointer (&path), (strlen (path))+1, g_free);
      |                                                                ~^~~~~~~~~~~~~~
```
This commit is contained in:
Colin Walters 2020-10-30 17:04:29 +00:00 committed by OpenShift Merge Robot
parent 607a04ae12
commit bbfdbe7916
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/daemon/rpmostree-sysroot-upgrader.c
View File

@ -1162,8 +1162,10 @@ generate_initramfs_overlay (GHashTable *initramfs_etc_files,
guint path_hash = g_str_hash (path); guint path_hash = g_str_hash (path);
if (path_hash == last_path_hash) if (path_hash == last_path_hash)
continue; continue;
/* we want the trailing NUL too as a separator */
const size_t n = strlen (path) + 1;
g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (filelist_input), g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (filelist_input),
g_steal_pointer (&path), (strlen (path))+1, g_free); g_steal_pointer (&path), n, g_free);
last_path_hash = path_hash; last_path_hash = path_hash;
} }