diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2009-04-23 19:33:00 +0100 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2009-04-23 19:33:00 +0100 |
commit | 8be6c7056d18cd5aa5edddfc73bfd4206b038cee (patch) | |
tree | 116c3bcd1bd7ecdd8ef07cc0cc4d25f38cf85a4c /daemon/debug.c | |
parent | 012a2ec1acf7a7a2d859f78ea4932ae9fb30522d (diff) | |
download | libguestfs-8be6c7056d18cd5aa5edddfc73bfd4206b038cee.tar.gz libguestfs-8be6c7056d18cd5aa5edddfc73bfd4206b038cee.tar.xz libguestfs-8be6c7056d18cd5aa5edddfc73bfd4206b038cee.zip |
catsprintf leaks, use open_memstream instead.
Diffstat (limited to 'daemon/debug.c')
-rw-r--r-- | daemon/debug.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/daemon/debug.c b/daemon/debug.c index fc105316..e4a7f055 100644 --- a/daemon/debug.c +++ b/daemon/debug.c @@ -114,15 +114,24 @@ static char * debug_fds (const char *subcmd, int argc, char *const *const argv) { int r; - char *out = NULL; + char *out; + size_t size; + FILE *fp; DIR *dir; struct dirent *d; char fname[256], link[256]; struct stat statbuf; + fp = open_memstream (&out, &size); + if (!fp) { + reply_with_perror ("open_memstream"); + return NULL; + } + dir = opendir ("/proc/self/fd"); if (!dir) { reply_with_perror ("opendir: /proc/self/fd"); + fclose (fp); return NULL; } @@ -135,6 +144,7 @@ debug_fds (const char *subcmd, int argc, char *const *const argv) r = lstat (fname, &statbuf); if (r == -1) { reply_with_perror ("stat: %s", fname); + fclose (fp); free (out); closedir (dir); return NULL; @@ -144,24 +154,20 @@ debug_fds (const char *subcmd, int argc, char *const *const argv) r = readlink (fname, link, sizeof link - 1); if (r == -1) { reply_with_perror ("readline: %s", fname); + fclose (fp); free (out); closedir (dir); return NULL; } link[r] = '\0'; - r = catprintf (&out, "%2s %s\n", d->d_name, link); + fprintf (fp, "%2s %s\n", d->d_name, link); } else - r = catprintf (&out, "%2s 0%o\n", d->d_name, statbuf.st_mode); - - if (r == -1) { - reply_with_perror ("catprintf"); - free (out); - closedir (dir); - return NULL; - } + fprintf (fp, "%2s 0%o\n", d->d_name, statbuf.st_mode); } + fclose (fp); + if (closedir (dir) == -1) { reply_with_perror ("closedir"); free (out); |