system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-06 16:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

microhttpd-util: avoid double free on error

Browse source 
It seems that resources are properly deallocated by MHD_destroy_response,
even if enqueuing the request fails.

Also replace a trivial printf with alloca and fixup log message
(it'll now be something like "Connection from CN=some.host.name",
which seems clear enough.)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-03-17 22:13:47 -04:00
parent 9786767a36
commit 4dd5da7f7d
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/journal/microhttpd-util.c
View file

@ -35,12 +35,9 @@
#endif
void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
_cleanup_free_ char *f = NULL;
char *f;
if (asprintf(&f, "microhttpd: %s", fmt) <= 0) {
log_oom();
return;
}
f = strappenda("microhttpd: ", fmt);
DISABLE_WARNING_FORMAT_NONLITERAL;
log_metav(LOG_INFO, NULL, 0, NULL, f, ap);
@ -101,10 +98,7 @@ int mhd_respondf(struct MHD_Connection *connection,
if (r < 0)
return respond_oom(connection);
r = mhd_respond_internal(connection, code, m, r, MHD_RESPMEM_MUST_FREE);
if (r == MHD_NO)
free(m);
return r;
return mhd_respond_internal(connection, code, m, r, MHD_RESPMEM_MUST_FREE);
}
#ifdef HAVE_GNUTLS
@ -256,7 +250,7 @@ int check_permissions(struct MHD_Connection *connection, int *code) {
return -EPERM;
}
log_info("Connection from DN %s", buf);
log_info("Connection from %s", buf);
r = verify_cert_authorized(session);
if (r < 0) {