On 07/01/2014 06:23 PM, Jakub Hrozek wrote:
On Tue, Jul 01, 2014 at 11:55:48AM +0200, Lukas Slebodnik wrote:
On (01/07/14 11:50), Jakub Hrozek wrote:
On Mon, Jun 30, 2014 at 03:20:50PM +0200, Lukas Slebodnik wrote:
FORWARD_NULL: -6
NULL_RETURNS: -49
Good job :-)
GetAll works fine and also other dbus methods.
ACK
LS
master:
a2ac7f081721cae6a6c4671fee3dfd9fe7d7da48
Do we want to have PB's patch also in 1-11 branch?
LS
Probably a good idea. Pavel, can you send a version that applies cleanly
on top of sssd-1-11 ?
Patch is attached.
sssd-1-11 is missing sssd_dbus_properties.c so change in this file was
removed. It should be the same patch otherwise.
From 3f0d1b533d376e47023aa751612d650932d39ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Wed, 2 Jul 2014 13:26:55 +0200
Subject: [PATCH] sbus_request: fix potential NULL dereference
---
src/sbus/sssd_dbus_request.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/sbus/sssd_dbus_request.c b/src/sbus/sssd_dbus_request.c
index 2d23931aa07a83c15c30b31615d5db7cfee11a0a..2e3b9310ee361396cadfa252465c59e12d4c44d3 100644
--- a/src/sbus/sssd_dbus_request.c
+++ b/src/sbus/sssd_dbus_request.c
@@ -63,10 +63,12 @@ sbus_request_invoke_or_finish(struct sbus_request *dbus_req,
DBusError error;
int ret;
- if (invoker_fn) {
+ if (invoker_fn != NULL) {
ret = invoker_fn(dbus_req, handler_fn);
- } else {
+ } else if (handler_fn != NULL) {
ret = handler_fn(dbus_req, handler_data);
+ } else {
+ ret = EINVAL;
}
switch(ret) {
@@ -131,6 +133,11 @@ int sbus_request_fail_and_finish(struct sbus_request *dbus_req,
DBusMessage *reply;
int ret;
+ if (error == NULL) {
+ sbus_request_finish(dbus_req, NULL);
+ return ENOMEM;
+ }
+
reply = dbus_message_new_error(dbus_req->message, error->name, error->message);
if (!reply) {
DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory allocating DBus message\n");
--
1.7.11.7
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
