chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev/collect: avoid initalizing memory twice
[elogind.git]
/
src
/
udev
/
collect
/
collect.c
diff --git
a/src/udev/collect/collect.c
b/src/udev/collect/collect.c
index 7850cfa4187ef0394260ff0ceac190faee55ee82..6580a091e0a95890f0975b0131030a135e2d08cb 100644
(file)
--- 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;
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);
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) {
ptr = buf + len;
while ((read(fd, buf + len, len)) > 0) {
while (ptr && *ptr) {