You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2013/04/26 16:58:20 UTC
svn commit: r1476242 - in /httpd/httpd/branches/2.2.x: ./ CHANGES STATUS
support/htdigest.c
Author: rjung
Date: Fri Apr 26 14:58:20 2013
New Revision: 1476242
URL: http://svn.apache.org/r1476242
Log:
htdigest: Fix buffer overflow when reading digest
password file with very long lines.
PR 54893.
Backport of r1475878 from trunk resp.
r1476089 from 2.4.x.
Proposed/Backported by: rjung
Reviewed by: humbedooh, rpluem
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/support/htdigest.c
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1475878
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1476242&r1=1476241&r2=1476242&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Apr 26 14:58:20 2013
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.25
+ *) htdigest: Fix buffer overflow when reading digest password file
+ with very long lines. PR 54893. [Rainer Jung]
Changes with Apache 2.2.24
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1476242&r1=1476241&r2=1476242&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Apr 26 14:58:20 2013
@@ -109,12 +109,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.2.x patch: http://people.apache.org/~wrowe/httpd-2.2-quiet-fips.patch
+1: wrowe, druggeri, kbrand
- * htdigest: Fix buffer overflow when reading digest
- password file with very long lines. PR 54893.
- trunk patch: https://svn.apache.org/r1475878
- 2.4.x patch: https://svn.apache.org/r1476089.
- 2.2.x patch: trunk and 2.4.x patch work
- +1: rjung, humbedooh, rpluem
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/support/htdigest.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/htdigest.c?rev=1476242&r1=1476241&r2=1476242&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/htdigest.c (original)
+++ httpd/httpd/branches/2.2.x/support/htdigest.c Fri Apr 26 14:58:20 2013
@@ -96,12 +96,15 @@ static int get_line(char *s, int n, apr_
char ch;
apr_status_t rv = APR_EINVAL;
- while (i < (n - 1) &&
+ /* we need 2 remaining bytes in buffer */
+ while (i < (n - 2) &&
((rv = apr_file_getc(&ch, f)) == APR_SUCCESS) && (ch != '\n')) {
s[i++] = ch;
}
+ /* First remaining byte potentially used here */
if (ch == '\n')
s[i++] = ch;
+ /* Second remaining byte used here */
s[i] = '\0';
if (rv != APR_SUCCESS)