diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2019-03-25 17:02:01 +1100 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2019-05-30 15:23:15 +1000 |
| commit | 9e869ebe3a5127575105d82c4d289d95cbed2db9 (patch) | |
| tree | 76c38714d5ebe26e4602aac6b594f4657e41a06d /lib/pb-config | |
| parent | 1cd261748c005b3c64b45f745a2fb3fb26236a4c (diff) | |
| download | talos-petitboot-9e869ebe3a5127575105d82c4d289d95cbed2db9.tar.gz talos-petitboot-9e869ebe3a5127575105d82c4d289d95cbed2db9.zip | |
Various fixups and checks to make scan-build happy
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'lib/pb-config')
| -rw-r--r-- | lib/pb-config/pb-config.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index a802c92..735cd98 100644 --- a/lib/pb-config/pb-config.c +++ b/lib/pb-config/pb-config.c @@ -43,6 +43,9 @@ struct config *config_copy(void *ctx, const struct config *src) struct config *dest; unsigned int i; + if (!src) + return NULL; + dest = talloc_zero(ctx, struct config); dest->autoboot_enabled = src->autoboot_enabled; dest->autoboot_timeout_sec = src->autoboot_timeout_sec; @@ -88,11 +91,14 @@ struct config *config_copy(void *ctx, const struct config *src) dest->allow_writes = src->allow_writes; dest->n_consoles = src->n_consoles; - if (src->consoles) + if (src->consoles) { dest->consoles = talloc_array(dest, char *, src->n_consoles); - for (i = 0; i < src->n_consoles && src->n_consoles; i++) - dest->consoles[i] = talloc_strdup(dest->consoles, + for (i = 0; i < src->n_consoles && src->n_consoles; i++) + if (src->consoles[i]) + dest->consoles[i] = talloc_strdup( + dest->consoles, src->consoles[i]); + } if (src->boot_console) dest->boot_console = talloc_strdup(dest, src->boot_console); |
