Commit a475dde6 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Initialize last_char as otherwise a random value will be compared 

  against APR_ASCII_LF at the end of the loop if bb only contains an
  EOS bucket.

PR: 39282
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394070 13f79535-47bb-0310-9956-ffa450edef68
parent 22d5f105

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) core: Prevent reading uninitialized memory while reading a line of









     protocol input.  PR 39282. [Davi Arnaut <davi haxent.com.br>]

















  *) htdbm: Fix crash processing -d option in 64-bit mode on HP-UX.









     [Jeff Trawick]










































server/protocol.c



+8
−0



























Changes for server/protocol.c: 8 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -217,6 +217,14 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,







    char *pos, *last_char = *s;









    int do_alloc = (*s == NULL), saw_eos = 0;



















    /*









     * Initialize last_char as otherwise a random value will be compared









     * against APR_ASCII_LF at the end of the loop if bb only contains an









     * EOS bucket.









     */









    if (last_char)









        *last_char = '\0';



















    for (;;) {









        apr_brigade_cleanup(bb);









        rv = ap_get_brigade(r->input_filters, bb, AP_MODE_GETLINE,