[PATCH 4/4] daemon: simplify string allocation
When creating an helper string for do_aug_match(), use a simpler asprintf() with manual free(), since the code block is small enough. This slightly helps static code analyzers. --- daemon/augeas.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/daemon/augeas.c b/daemon/augeas.c index bd54c4849..453251337 100644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -420,17 +420,15 @@ do_aug_ls (const char *path) if (STREQ (path, "/")) matches = do_aug_match ("/*"); else { - CLEANUP_FREE char *buf = NULL; + char *buf = NULL; - len += 3; /* / * + terminating \0 */ - buf = malloc (len); - if (buf == NULL) { - reply_with_perror ("malloc"); + if (asprintf (&buf, "%s/*", path) == -1) { + reply_with_perror ("asprintf"); return NULL; } - snprintf (buf, len, "%s/*", path); matches = do_aug_match (buf); + free (buf); } if (matches == NULL) -- 2.14.3
ACK series. Were these found by Coverity? If so then we usually mention that in the commit message. Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
On Mon, Apr 30, 2018 at 12:20:51PM +0100, Richard W.M. Jones wrote:
ACK series.
I pushed these in order to get them into the next 1.39.4 release. Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
participants (2)
-
Pino Toscano -
Richard W.M. Jones