Commit eb119aa9 authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

Merge 394070 from trunk; 

* 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/branches/2.0.x@395197 13f79535-47bb-0310-9956-ffa450edef68
parent d07d9025

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.57













  *) core: Prevent read of unitialized memory in ap_rgetline_core. PR 39282.













     [Davi Arnaut <davi haxent.com.br>]



























  *) mod_proxy: Report the proxy server name correctly in the "Via:" header,















     when UseCanonicalName is Off. PR 11971. [Martin Kraemer]















































STATUS



+0
−10






























Original line number
Diff line number
Diff line








@@ -121,16 +121,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:













         http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=113813652015559















       +1: colm, trawick, jim





























    *) core: Prevent read of unitialized memory in ap_rgetline_core. PR 39282.













        Trunk version of patch:













          http://svn.apache.org/viewcvs?rev=394070&view=rev













        2.0.x version of patch:













          http://issues.apache.org/bugzilla/attachment.cgi?id=18112













      +1: rpluem, colm













      niq: change comment "if bb only contains an EOS bucket"













           to "if bb contains only zero-length buckets"













           and you have my +1





























PATCHES PROPOSED TO BACKPORT FROM TRUNK:















  [ please place SVN revisions from trunk here, so it is easy to















    identify exactly what the proposed changes are!  Add all new

































server/protocol.c



+8
−0






























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 













     * zero-length buckets.













     */













    if (last_char)













        *last_char = '\0';





























    for (;;) {















    apr_brigade_cleanup(bb);















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