mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Import ITS#1983 fixes from HEAD. (Also fixes ITS#910, updates ITS#1861 fix.)

Browse Source 
Fix large SASL reads and writes.
This commit is contained in:
Howard Chu 2002-09-05 22:53:36 +00:00
parent 001b7b6927
commit 847659f97e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/liblber/sockbuf.c
View File

@ -309,11 +309,6 @@ ber_pvt_sb_do_write( Sockbuf_IO_Desc *sbiod, Sockbuf_Buf *buf_out )
buf_out->buf_end = buf_out->buf_ptr = 0;
}
if ( (ber_len_t)ret < to_go ) {
/* not enough data, so pretend no data was sent. */
return -1;
}
return ret;
}

17
libraries/libldap/cyrus.c
View File

@ -149,12 +149,16 @@ sb_sasl_pkt_length( const unsigned char *buf, unsigned max, int debuglevel )
| buf[2] << 8
| buf[3];
if ( size > max ) {
if ( size > SASL_MAX_BUFF_SIZE ) {
/* somebody is trying to mess me up. */
ber_log_printf( LDAP_DEBUG_ANY, debuglevel,
"sb_sasl_pkt_length: received illegal packet length "
"of %lu bytes\n", (unsigned long)size );
size = 16; /* this should lead to an error. */
} else if ( size > max ) {
ber_log_printf( LDAP_DEBUG_ANY, debuglevel,
"sb_sasl_pkt_length: received packet length "
"of %lu exceeds negotiated max of %lu bytes\n", (unsigned long)size, (unsigned long)max );
}
return size + 4; /* include the size !!! */
@ -211,7 +215,7 @@ sb_sasl_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
continue;
#endif
if ( ret <= 0 )
return ret;
return bufptr ? bufptr : ret;
p->sec_buf_in.buf_ptr += ret;
}
@ -240,7 +244,7 @@ sb_sasl_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
continue;
#endif
if ( ret <= 0 )
return ret;
return bufptr ? bufptr : ret;
p->sec_buf_in.buf_ptr += ret;
}
@ -283,8 +287,13 @@ sb_sasl_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
/* Are there anything left in the buffer? */
if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
ret = ber_pvt_sb_do_write( sbiod, &p->buf_out );
if ( ret <= 0 )
if ( ret < 0 )
return ret;
/* Still have something left?? */
if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
errno = EAGAIN;
return 0;
}
}
/* now encode the next packet. */