aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-04-13 02:04:09 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-04-13 02:04:09 +0000
commit9c831bbd699f824944cf3fcc4bcd49cca8bbff7e (patch)
tree92bbcf5b84bdd150282eaf6ec82e328e0e517eca /usr.sbin
parenta123f26e9290a4636e3a8d7ac10dbd000fc50f59 (diff)
parent074e77e66eb40fe39c97f323b157c99e7e828750 (diff)
downloadsrc-9c831bbd699f824944cf3fcc4bcd49cca8bbff7e.tar.gz
src-9c831bbd699f824944cf3fcc4bcd49cca8bbff7e.zip
MFH
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-pkg/; revision=297906
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ypldap/ber.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/usr.sbin/ypldap/ber.c b/usr.sbin/ypldap/ber.c
index 540df69ae760..f73ecef86641 100644
--- a/usr.sbin/ypldap/ber.c
+++ b/usr.sbin/ypldap/ber.c
@@ -1083,6 +1083,15 @@ ber_read_element(struct ber *ber, struct ber_element *elm)
DPRINTF("ber read element size %zd\n", len);
totlen += r + len;
+ /*
+ * If using an external buffer and the total size of the element
+ * is larger, then the external buffer don't bother to continue.
+ */
+ if (ber->fd == -1 && len > ber->br_rend - ber->br_rptr) {
+ errno = ECANCELED;
+ return -1;
+ }
+
elm->be_type = type;
elm->be_len = len;
elm->be_class = class;