[PATCH] Fix two CIDs

Volker Lendecke vl at samba.org
Tue Jun 28 12:59:48 UTC 2016


Hi!

Review appreciated!

Thanks, Volker
-------------- next part --------------
>From d3699899c248d6f3ce61c8043dafd41e0141121f Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 28 Jun 2016 14:38:57 +0200
Subject: [PATCH 1/2] libnet: Fix CID 1362934: CHECKED_RETURN

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source4/libnet/libnet_samsync_ldb.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index f3a45b8..5fdef79 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -414,7 +414,12 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
 			samdb_msg_add_delete(state->sam_ldb, mem_ctx, msg,  
 					     remote_attrs[i]); 
 		} else {
-			ldb_msg_add(msg, el, LDB_FLAG_MOD_REPLACE);
+			ret = ldb_msg_add(msg, el, LDB_FLAG_MOD_REPLACE);
+			if (ret != LDB_SUCCESS) {
+				*error_string = talloc_strdup(
+					mem_ctx, "ldb_msg_add failed");
+				return NT_STATUS_NO_MEMORY;
+			}
 		}
 	}
 
-- 
2.1.4


>From 0779ac26b80215318df95eaad218e08af5daa2f6 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 28 Jun 2016 14:41:19 +0200
Subject: [PATCH 2/2] ldb: Fix CID 1362935: CHECKED_RETURN

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 lib/ldb/ldb_map/ldb_map.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/ldb/ldb_map/ldb_map.c b/lib/ldb/ldb_map/ldb_map.c
index 66b0059..f2a86fe 100644
--- a/lib/ldb/ldb_map/ldb_map.c
+++ b/lib/ldb/ldb_map/ldb_map.c
@@ -727,6 +727,7 @@ static void map_objectclass_generate_remote(struct ldb_module *module, const cha
 	struct ldb_val val;
 	bool found_extensibleObject = false;
 	unsigned int i;
+	int ret;
 
 	ldb = ldb_module_get_ctx(module);
 
@@ -774,7 +775,11 @@ static void map_objectclass_generate_remote(struct ldb_module *module, const cha
 	}
 
 	/* Add new objectClass to remote message */
-	ldb_msg_add(remote, el, 0);
+	ret = ldb_msg_add(remote, el, 0);
+	if (ret != LDB_SUCCESS) {
+		ldb_oom(ldb);
+		return;
+	}
 }
 
 /* Map an objectClass into the local partition. */
-- 
2.1.4



More information about the samba-technical mailing list