From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 22 Mar 2013 00:05:42 +0000 (-0400)
Subject: udev/collect: avoid initalizing memory twice
X-Git-Tag: v199~78
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7d566799022b24fef2bb8ca6d671bf8ad14d9e26;p=elogind.git

udev/collect: avoid initalizing memory twice
---

diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 7850cfa41..6580a091e 100644
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -139,12 +139,14 @@ static int checkout(int fd)
 
  restart:
         len = bufsize >> 1;
-        buf = calloc(1,bufsize + 1);
+        buf = malloc(bufsize + 1);
         if (!buf) {
                 fprintf(stderr, "Out of memory.\n");
                 return log_oom();
         }
         memset(buf, ' ', bufsize);
+        buf[bufsize] = '\0';
+
         ptr = buf + len;
         while ((read(fd, buf + len, len)) > 0) {
                 while (ptr && *ptr) {