wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not eat trailing '\n' in BIO_gets for fd BIO.

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3442)
This commit is contained in:
Tomas Mraz 2016-11-15 10:10:32 +01:00 committed by Richard Levitte
parent 62f218cb8d
commit 79b35228f1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crypto/bio/bss_fd.c
View file

@ -207,8 +207,10 @@ static int fd_gets(BIO *bp, char *buf, int size)
char *ptr = buf; char *ptr = buf;
char *end = buf + size - 1; char *end = buf + size - 1;
while ((ptr < end) && (fd_read(bp, ptr, 1) > 0) && (ptr[0] != '\n')) while (ptr < end && fd_read(bp, ptr, 1) > 0) {
ptr++; if (*ptr++ == '\n')
break;
}
ptr[0] = '\0'; ptr[0] = '\0';