dpward / rpms / sssd

Forked from rpms/sssd 3 years ago
Clone
Blob Blame History Raw
From 61b6c497901004e34f1bdf6d3c04c2943720a500 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Wed, 29 Oct 2014 15:20:12 +0100
Subject: [PATCH 51/64] memberof: check for empty arrays to avoid segfaults

The arrays with members to add or delete may be empty, i.e. have 0
entries. In this case further processing should be skipped to avoid
segfaults later on.

Fixes (hopefully) https://fedorahosted.org/sssd/ticket/2430

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
---
 src/ldb_modules/memberof.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ldb_modules/memberof.c b/src/ldb_modules/memberof.c
index ceeba0e474dfbe53f7133df996e3bad454fdac9e..995c382a8ee36bfc010f2761010db1fb48343d5d 100644
--- a/src/ldb_modules/memberof.c
+++ b/src/ldb_modules/memberof.c
@@ -3654,7 +3654,7 @@ static int mbof_mod_add(struct mbof_mod_ctx *mod_ctx,
         }
     }
 
-    if (ael != NULL) {
+    if (ael != NULL && ael->num > 0) {
         /* Add itself to the list of the parents to also get the memberuid */
         parents->dns = talloc_realloc(parents, parents->dns,
                                     struct ldb_dn *, parents->num + 1);
@@ -3724,7 +3724,7 @@ static int mbof_mod_delete(struct mbof_mod_ctx *mod_ctx,
     }
 
     /* prepare del sets */
-    if (del != NULL) {
+    if (del != NULL && del->num > 0) {
         for (i = 0; i < del->num; i++) {
             ret = mbof_append_delop(first, del->dns[i]);
             if (ret != LDB_SUCCESS) {
-- 
1.9.3