aboutsummaryrefslogtreecommitdiffstats
path: root/main/openldap/CVE-2015-6908.patch
blob: 9a2474c6474bb922e59688a4af986df1f46a1ee9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
From: Howard Chu <hyc@symas.com>
Date: Sat, 12 Sep 2015 21:18:22 +0000 (+0100)
Subject: Revert "Revert "ITS#8240 remove obsolete assert""
X-Git-Url: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commitdiff_plain;h=844ee7df820fa397249ce76984d2e7094746cd93;hp=55dd4d3275d24c5190fdfada8dfae0320628b993

Revert "Revert "ITS#8240 remove obsolete assert""

We have never documented our use of assert, so can't expect
builders to do the right thing.
This reverts commit 55dd4d3275d24c5190fdfada8dfae0320628b993.
---

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 85c3e23..c05dcf8 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -679,7 +679,7 @@ done:
 		return (ber->ber_tag);
 	}
 
-	assert( 0 ); /* ber structure is messed up ?*/
+	/* invalid input */
 	return LBER_DEFAULT;
 }