upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ber_get_next: return error if decoded ber_len is smaller than actual count

Browse source
This commit is contained in:
Howard Chu 2002-02-13 09:59:10 +00:00
parent 2a2d6cc93e
commit ab099caed5
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/liblber/io.c
View file

@ -548,6 +548,15 @@ ber_get_next(
}
if (ber->ber_buf==NULL) {
ber_len_t l = ber->ber_rwptr - ber->ber_ptr;
/* ber->ber_ptr is always <= ber->ber->ber_rwptr.
* make sure ber->ber_len agrees with what we've
* already read.
*/
if ( ber->ber_len < i + l ) {
errno = ERANGE;
return LBER_DEFAULT;
}
ber->ber_buf = (char *) LBER_MALLOC( ber->ber_len + 1 );
if (ber->ber_buf==NULL) {
return LBER_DEFAULT;
@ -556,10 +565,9 @@ ber_get_next(
if (i) {
AC_MEMCPY(ber->ber_buf, buf, i);
}
if (ber->ber_ptr < ber->ber_rwptr) {
AC_MEMCPY(ber->ber_buf + i, ber->ber_ptr, ber->ber_rwptr-
ber->ber_ptr);
i += ber->ber_rwptr - ber->ber_ptr;
if (l > 0) {
AC_MEMCPY(ber->ber_buf + i, ber->ber_ptr, l);
i += l;
}
ber->ber_ptr = ber->ber_buf;
ber->ber_usertag = 0;