public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/daemons/common daemon-server.c Date: Tue, 28 Feb 2012 14:25:00 -0000 [thread overview] Message-ID: <20120228142537.29580.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2012-02-28 14:25:37 Modified files: daemons/common : daemon-server.c Log message: Check for failing dm_asprintf Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/common/daemon-server.c.diff?cvsroot=lvm2&r1=1.18&r2=1.19 --- LVM2/daemons/common/daemon-server.c 2012/02/28 13:05:21 1.18 +++ LVM2/daemons/common/daemon-server.c 2012/02/28 14:25:37 1.19 @@ -339,18 +339,23 @@ static int buffer_rewrite(char **buf, const char *format, const char *string) { char *old = *buf; - dm_asprintf(buf, format, *buf, string); + int r = dm_asprintf(buf, format, *buf, string); + dm_free(old); - return 0; + + return (r < 0) ? 0 : 1; } static int buffer_line(const char *line, void *baton) { response *r = baton; - if (r->buffer) - buffer_rewrite(&r->buffer, "%s\n%s", line); - else - dm_asprintf(&r->buffer, "%s\n", line); - return 0; + + if (r->buffer) { + if (!buffer_rewrite(&r->buffer, "%s\n%s", line)) + return 0; + } else if (dm_asprintf(&r->buffer, "%s\n", line) < 0) + return 0; + + return 1; } static response builtin_handler(daemon_state s, client_handle h, request r) @@ -387,7 +392,8 @@ if (!res.buffer) { dm_config_write_node(res.cft->root, buffer_line, &res); - buffer_rewrite(&res.buffer, "%s\n\n", NULL); + if (!buffer_rewrite(&res.buffer, "%s\n\n", NULL)) + goto fail; dm_config_destroy(res.cft); }
next reply other threads:[~2012-02-28 14:25 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-02-28 14:25 zkabelac [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-02-28 13:05 prajnoha 2012-01-25 21:30 zkabelac 2012-01-15 10:33 mornfall 2011-07-20 18:23 mornfall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120228142537.29580.qmail@sourceware.org \ --to=zkabelac@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).