Commit c3cc6162 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Junk data could get inserted when saving/getting HTTP headers, as discovered 

by Craig Davison. Now we deal with the 'nread' variable correctly between
each header line.
parent 91b84b89

lib/transfer.c

+3 −7
Original line number Diff line number Diff line
@@ -302,6 +302,9 @@ CURLcode Curl_readwrite(struct connectdata *conn, 
            break;		/* read more and try again */

          }



          /* decrease the size of the remaining buffer */

          nread -= (k->end_ptr - k->str)+1; 



          k->str = k->end_ptr + 1; /* move past new line */



          /*
@@ -696,13 +699,6 @@ CURLcode Curl_readwrite(struct connectdata *conn, 
           there might be a non-header part left in the end of the read

           buffer. */



        if (!k->header) {

          /* starting here, this is not part of the header! */



          /* we subtract the remaining header size from the buffer */

          nread -= (k->str - k->buf);

        }



      }			/* end if header mode */



      /* This is not an 'else if' since it may be a rest from the header