diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-10-17 20:40:09 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-10-26 10:52:41 +0200 |
commit | d68c645bd3323ae1f0dfcb8fd74ea6b19681db8a (patch) | |
tree | eff23147292bf0e0ee6066054b8e6e933ccd1b64 /src/shared/serialize.h | |
parent | cdd620e3460b08d1f5b80cefefef352de42fb792 (diff) | |
download | systemd-d68c645bd3323ae1f0dfcb8fd74ea6b19681db8a.tar.gz |
core: rework serialization
Let's be more careful with what we serialize: let's ensure we never
serialize strings that are longer than LONG_LINE_MAX, so that we know we
can read them back with read_line(…, LONG_LINE_MAX, …) safely.
In order to implement this all serialization functions are move to
serialize.[ch], and internally will do line size checks. We'd rather
skip a serialization line (with a loud warning) than write an overly
long line out. Of course, this is just a second level protection, after
all the data we serialize shouldn't be this long in the first place.
While we are at it also clean up logging: while serializing make sure to
always log about errors immediately. Also, (void)ify all calls we don't
expect errors in (or catch errors as part of the general
fflush_and_check() at the end.
Diffstat (limited to 'src/shared/serialize.h')
-rw-r--r-- | src/shared/serialize.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/shared/serialize.h b/src/shared/serialize.h new file mode 100644 index 0000000000..a671524153 --- /dev/null +++ b/src/shared/serialize.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +#pragma once + +#include <stdio.h> + +#include "fdset.h" +#include "macro.h" + +int serialize_item(FILE *f, const char *key, const char *value); +int serialize_item_escaped(FILE *f, const char *key, const char *value); +int serialize_item_format(FILE *f, const char *key, const char *value, ...) _printf_(3,4); +int serialize_fd(FILE *f, FDSet *fds, const char *key, int fd); +int serialize_usec(FILE *f, const char *key, usec_t usec); +int serialize_dual_timestamp(FILE *f, const char *key, const dual_timestamp *t); +int serialize_strv(FILE *f, const char *key, char **l); + +static inline int serialize_bool(FILE *f, const char *key, bool b) { + return serialize_item(f, key, yes_no(b)); +} + +int deserialize_usec(const char *value, usec_t *timestamp); +int deserialize_dual_timestamp(const char *value, dual_timestamp *t); +int deserialize_environment(const char *value, char ***environment); |