2 files changed, 4 insertions, 1 deletions
diff --git a/src/responder/sudo/sudosrv_dp.c b/src/responder/sudo/sudosrv_dp.c
index 0c621f5d5..27f01f92b 100644
--- a/src/responder/sudo/sudosrv_dp.c
+++ b/src/responder/sudo/sudosrv_dp.c
@@ -107,6 +107,8 @@ struct tevent_req * sudosrv_dp_refresh_send(struct resp_ctx *rctx,
 error:
     tevent_req_error(req, ret);
     tevent_req_post(req, rctx->ev);
+    dbus_message_unref(msg);
+
     return req;
 }
 
diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c
index 5d54f95ab..fca6257d8 100644
--- a/src/responder/sudo/sudosrv_get_sudorules.c
+++ b/src/responder/sudo/sudosrv_get_sudorules.c
@@ -481,7 +481,8 @@ char * sudosrv_get_sudorules_parse_query(TALLOC_CTX *mem_ctx,
                                          const char *query_body,
                                          int query_len)
 {
-    if (query_len < 2 || ((query_len - 1) != strlen(query_body))) {
+    /* empty string or not NULL terminated */
+    if (query_len < 2 || strnlen(query_body, query_len) == query_len) {
         DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid query.\n"));
         return NULL;
     }