forked from jengelh/openldap2
28 lines
715 B
Diff
28 lines
715 B
Diff
|
From 844ee7df820fa397249ce76984d2e7094746cd93 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Howard Chu <hyc@symas.com>
|
||
|
|
Date: Sat, 12 Sep 2015 22:18:22 +0100
|
||
|
|
Subject: [PATCH] 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.
|
||
|
|
|
||
|
|
The commit fixes CVE-2015-6908.
|
||
|
|
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.6.3
|
||
|
|
|