Skip to content
Snippets Groups Projects
Commit abb14de7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

GetLine() didn't properly act on -1 lengths returned from Curl_read()

parent ccd57e58
No related branches found
No related tags found
No related merge requests found
...@@ -226,17 +226,18 @@ int GetLine(int sockfd, char *buf, struct connectdata *conn) ...@@ -226,17 +226,18 @@ int GetLine(int sockfd, char *buf, struct connectdata *conn)
(nread<BUFSIZE) && read_rc; (nread<BUFSIZE) && read_rc;
nread++, ptr++) { nread++, ptr++) {
if((CURLE_OK != Curl_read(conn, sockfd, ptr, 1, &nread)) || if((CURLE_OK != Curl_read(conn, sockfd, ptr, 1, &nread)) ||
(nread <= 0) ||
(*ptr == '\n')) (*ptr == '\n'))
break; break;
} }
*ptr=0; /* zero terminate */ *ptr=0; /* zero terminate */
if(data->bits.verbose) { if(data->bits.verbose) {
fputs("< ", data->err); fputs("< ", data->err);
fwrite(buf, 1, nread, data->err); fwrite(buf, 1, nread, data->err);
fputs("\n", data->err); fputs("\n", data->err);
} }
return nread; return nread>0?nread:0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment