mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

More for ITS#4365 refix CR/LF handling

Browse Source 
Was rejecting "-\r\n" in input LDIF
This commit is contained in:
Howard Chu 2014-02-07 00:31:23 -08:00
parent 5c878c1bf2
commit 106a4b90aa
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/libldap/ldif.c
View File

@ -853,11 +853,16 @@ ldif_read_record(
line[++len] = '\0';
}
/* Squash \r\n to \n */
if ( len > 1 && line[len-2] == '\r' ) {
len--;
line[len-1] = '\n';
}
if ( last_ch == '\n' ) {
(*lno)++;
if ( line[0] == '\n' ||
( line[0] == '\r' && line[1] == '\n' )) {
if ( line[0] == '\n' ) {
if ( !found_entry ) {
lcur = 0;
top_comment = 0;
@ -887,10 +892,6 @@ ldif_read_record(
len--;
line[len] = '\0';
}
if ( line[len-1] == '\r' ) {
len--;
line[len] = '\0';
}
ptr = line + STRLENOF("include:");
while (isspace((unsigned char) *ptr)) ptr++;