Commit 189f312d authored by Howard Chu's avatar Howard Chu
Browse files

ITS#7859 refix

This was actually broken by 65e163d2, ITS#6947. Reverting both
of those changes and fixing #6947 again.
parent eb5faf59
......@@ -838,20 +838,24 @@ ldif_read_record(
break;
}
}
if ( stop )
break;
if ( fgets( line, sizeof( line ), lfp->fp ) == NULL ) {
stop = 1;
len = 0;
} else {
len = strlen( line );
if ( !stop ) {
if ( fgets( line, sizeof( line ), lfp->fp ) == NULL ) {
stop = 1;
len = 0;
} else {
len = strlen( line );
}
}
if ( len == 0 || line[len-1] != '\n' ) {
/* Add \n in case the line/file does not end with newline */
line[len] = '\n';
line[++len] = '\0';
if ( stop ) {
/* Add \n in case the file does not end with newline */
if (last_ch != '\n') {
len = 1;
line[0] = '\n';
line[1] = '\0';
goto last;
}
break;
}
/* Squash \r\n to \n */
......@@ -920,9 +924,10 @@ ldif_read_record(
}
}
}
}
}
}
last:
if ( *buflenp - lcur <= len ) {
*buflenp += len + LDIF_MAXLINE;
nbufp = ber_memrealloc( *bufp, *buflenp );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment