summaryrefslogtreecommitdiffstats
path: root/usr.sbin/snmpd/ber.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/snmpd/ber.c')
-rw-r--r--usr.sbin/snmpd/ber.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/snmpd/ber.c b/usr.sbin/snmpd/ber.c
index ccdd491df01..aac9ded2674 100644
--- a/usr.sbin/snmpd/ber.c
+++ b/usr.sbin/snmpd/ber.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ber.c,v 1.50 2018/11/27 12:10:29 martijn Exp $ */
+/* $OpenBSD: ber.c,v 1.51 2019/04/27 14:58:15 rob Exp $ */
/*
* Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -1240,8 +1240,9 @@ ber_read_element(struct ber *ber, struct ber_element *elm)
}
/* sign extend if MSB is set */
- if (val >> ((i - 1) * 8) & 0x80)
- val |= ULLONG_MAX << (i * 8);
+ if (len < (ssize_t)sizeof(long long) &&
+ (val >> ((len - 1) * 8) & 0x80))
+ val |= ULLONG_MAX << (len * 8);
elm->be_numeric = val;
break;
case BER_TYPE_BITSTRING: