pool/openldap2
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 556544 from network:ldap

Browse Source 
- added 0016-ITS-8782-fix-cancel-memleak.patch

OBS-URL: https://build.opensuse.org/request/show/556544
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=129
This commit is contained in:
Dominique Leuenberger 2017-12-14 09:53:18 +00:00 committed by Git OBS Bridge
commit 9cba935c14
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0016-ITS-8782-fix-cancel-memleak.patch Normal file
View File

@ -0,0 +1,46 @@
From f82ca15a1862749e13a989599d7f4c52c7648957 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Mon, 4 Dec 2017 15:59:33 +0000
Subject: ITS#8782 plug memleaks in cancel
diff --git a/libraries/libldap/cancel.c b/libraries/libldap/cancel.c
index b09f6f021..f3677b13a 100644
--- a/libraries/libldap/cancel.c
+++ b/libraries/libldap/cancel.c
@@ -42,14 +42,14 @@ ldap_cancel(
int *msgidp )
{
BerElement *cancelidber = NULL;
- struct berval *cancelidvalp = NULL;
+ struct berval cancelidvalp = { 0, NULL };
int rc;
cancelidber = ber_alloc_t( LBER_USE_DER );
ber_printf( cancelidber, "{i}", cancelid );
- ber_flatten( cancelidber, &cancelidvalp );
+ ber_flatten2( cancelidber, &cancelidvalp, 0 );
rc = ldap_extended_operation( ld, LDAP_EXOP_CANCEL,
- cancelidvalp, sctrls, cctrls, msgidp );
+ &cancelidvalp, sctrls, cctrls, msgidp );
ber_free( cancelidber, 1 );
return rc;
}
@@ -62,14 +62,14 @@ ldap_cancel_s(
LDAPControl **cctrls )
{
BerElement *cancelidber = NULL;
- struct berval *cancelidvalp = NULL;
+ struct berval cancelidvalp = { 0, NULL };
int rc;
cancelidber = ber_alloc_t( LBER_USE_DER );
ber_printf( cancelidber, "{i}", cancelid );
- ber_flatten( cancelidber, &cancelidvalp );
+ ber_flatten2( cancelidber, &cancelidvalp, 0 );
rc = ldap_extended_operation_s( ld, LDAP_EXOP_CANCEL,
- cancelidvalp, sctrls, cctrls, NULL, NULL );
+ &cancelidvalp, sctrls, cctrls, NULL, NULL );
ber_free( cancelidber, 1 );
return rc;
}

5
openldap2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 11 22:51:03 UTC 2017 - michael@stroeder.com
- added 0016-ITS-8782-fix-cancel-memleak.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 23 13:36:52 UTC 2017 - rbrown@suse.com Thu Nov 23 13:36:52 UTC 2017 - rbrown@suse.com

2
openldap2.spec
View File

@ -66,6 +66,7 @@ Patch12: 0012-ITS8051-sockdnpat.patch
Patch13: 0013-ITS-8692-let-back-sock-generate-increment-line.patch Patch13: 0013-ITS-8692-let-back-sock-generate-increment-line.patch
Patch14: 0014-ITS-8714-Send-out-EXTENDED-operation-message-from-back-sock.patch Patch14: 0014-ITS-8714-Send-out-EXTENDED-operation-message-from-back-sock.patch
Patch15: openldap-r-only.dif Patch15: openldap-r-only.dif
Patch16: 0016-ITS-8782-fix-cancel-memleak.patch
Source200: %{name_ppolicy_check_module}-%{version_ppolicy_check_module}.tar.gz Source200: %{name_ppolicy_check_module}-%{version_ppolicy_check_module}.tar.gz
Source201: %{name_ppolicy_check_module}.Makefile Source201: %{name_ppolicy_check_module}.Makefile
Source202: %{name_ppolicy_check_module}.conf Source202: %{name_ppolicy_check_module}.conf
@ -262,6 +263,7 @@ gzip -k %{S:203}
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1
cp %{SOURCE5} . cp %{SOURCE5} .
# Move ppolicy check module and its Makefile into openldap-2.4/contrib/slapd-modules/ # Move ppolicy check module and its Makefile into openldap-2.4/contrib/slapd-modules/