chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9446904
)
journald: fix bad memory access
author
Lennart Poettering
<lennart@poettering.net>
Wed, 18 Jul 2012 11:10:09 +0000
(13:10 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 18 Jul 2012 11:13:15 +0000
(13:13 +0200)
After vacuuming we need to retrieve the journal file object again, since
it might have changed.
src/journal/journald.c
patch
|
blob
|
history
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index d8cfa66b75dfb10e7bb51e2927a25386e2eda867..c29d75c9c4045a22af163f3fbe5a689d87eb30f2 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-513,6
+513,10
@@
static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned
server_vacuum(s);
vacuumed = true;
server_vacuum(s);
vacuumed = true;
+ f = find_journal(s, uid);
+ if (!f)
+ return;
+
log_info("Retrying write.");
}
}
log_info("Retrying write.");
}
}