packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/static-delta: document and check parameters format 

This enhances the logic handling GVariant parameters within
`ostree_repo_static_delta_generate()`.
Several of those entries are expected to be zero-terminated values,
and this implicit assumption has been observed to be an hidden trap
in languages where strings and arrays may not carry a terminator value
(e.g. Rust).
In order to improve the situation, this makes the documentation more
explicit and actively tries to catch invalid input parameters.
This commit is contained in:
Luca BRUNO 2022-10-11 08:50:10 +00:00
parent 14f513cf02
commit 763d2d2863
No known key found for this signature in database
GPG Key ID: A9834A2252078E4E
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libostree/ostree-repo-static-delta-compilation.c
View File

@ -1334,9 +1334,9 @@ get_fallback_headers (OstreeRepo *self,
* - inline-parts: b: Put part data in header, to get a single file delta. Default FALSE. * - inline-parts: b: Put part data in header, to get a single file delta. Default FALSE.
* - verbose: b: Print diagnostic messages. Default FALSE. * - verbose: b: Print diagnostic messages. Default FALSE.
* - endianness: b: Deltas use host byte order by default; this option allows choosing (G_BIG_ENDIAN or G_LITTLE_ENDIAN) * - endianness: b: Deltas use host byte order by default; this option allows choosing (G_BIG_ENDIAN or G_LITTLE_ENDIAN)
* - filename: ay: Save delta superblock to this filename, and parts in the same directory. Default saves to repository. * - filename: ^ay: Save delta superblock to this filename (bytestring), and parts in the same directory. Default saves to repository.
* - sign-name: ay: Signature type to use. * - sign-name: ^ay: Signature type to use (bytestring).
* - sign-key-ids: as: Array of keys used to sign delta superblock. * - sign-key-ids: ^as: NULL-terminated array of keys used to sign delta superblock.
*/ */
gboolean gboolean
ostree_repo_static_delta_generate (OstreeRepo *self, ostree_repo_static_delta_generate (OstreeRepo *self,
@ -1409,9 +1409,13 @@ ostree_repo_static_delta_generate (OstreeRepo *self,
if (!g_variant_lookup (params, "filename", "^&ay", &opt_filename)) if (!g_variant_lookup (params, "filename", "^&ay", &opt_filename))
opt_filename = NULL; opt_filename = NULL;
else if (opt_filename[0] == '\0')
return glnx_throw (error, "Invalid 'filename' parameter");
if (!g_variant_lookup (params, "sign-name", "^&ay", &opt_sign_name)) if (!g_variant_lookup (params, "sign-name", "^&ay", &opt_sign_name))
opt_sign_name = NULL; opt_sign_name = NULL;
else if (opt_sign_name[0] == '\0')
return glnx_throw (error, "Invalid 'sign-name' parameter");
if (!g_variant_lookup (params, "sign-key-ids", "^a&s", &opt_key_ids)) if (!g_variant_lookup (params, "sign-key-ids", "^a&s", &opt_key_ids))
opt_key_ids = NULL; opt_key_ids = NULL;