[389-commits] [389-ds-base] branch master updated: Issue 50431 - Fix regression from coverity fix

This is an automated email from the git hooks/post-receive script.

mreynolds pushed a commit to branch master
in repository 389-ds-base.

The following commit(s) were added to refs/heads/master by this push:
new 054d32e Issue 50431 - Fix regression from coverity fix
054d32e is described below

commit 054d32e7b697513124a37dade54828ec52397c1c
Author: Mark Reynolds <mreynolds@redhat.com>
AuthorDate: Thu Jun 13 17:55:25 2019 -0400

Issue 50431 - Fix regression from coverity fix

Description: Fix a regression from the initial coverity commit
where we did not allow NULL pointers to set into
the pblock. They were false positives reported by
covscan.

https://pagure.io/389-ds-base/issue/50431

Reviewed by: mreynolds (one line commit rule)
---
ldap/servers/plugins/acl/acleffectiverights.c | 4 +---
ldap/servers/plugins/views/views.c | 4 +---
ldap/servers/slapd/back-ldbm/vlv_srch.c | 3 ++-
ldap/servers/slapd/dse.c | 6 ++----
ldap/servers/slapd/opshared.c | 3 +--
ldap/servers/slapd/plugin_internal_op.c | 3 +--
ldap/servers/slapd/plugin_syntax.c | 4 +---
7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/ldap/servers/plugins/acl/acleffectiverights.c b/ldap/servers/plugins/acl/acleffectiverights.c
index 5dd46a0..8a34ac5 100644
--- a/ldap/servers/plugins/acl/acleffectiverights.c
+++ b/ldap/servers/plugins/acl/acleffectiverights.c
@@ -1030,9 +1030,7 @@ bailout:
* slapi_pblock_set() will free any previous data, and
* pblock_done() will free SLAPI_PB_RESULT_TEXT.
*/
- if (gerstr) {
- slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, gerstr);
- }
+ slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, gerstr);

if (!iscritical) {
/*
diff --git a/ldap/servers/plugins/views/views.c b/ldap/servers/plugins/views/views.c
index 5d84647..64e305a 100644
--- a/ldap/servers/plugins/views/views.c
+++ b/ldap/servers/plugins/views/views.c
@@ -1760,9 +1760,7 @@ view_search_rewrite_callback(Slapi_PBlock *pb)