Actually re-fix Christian's recommendation, someone previously caught this.

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

diff --git a/CHANGES b/CHANGES
index ffaf348fb8513cd77b282a4f3854c02f85ef2b17..45fb51de6d678ac3d5b2ce13095733952eed90b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,8 +4,7 @@ Changes with Apache 2.3.0
 
   *) core; scoreboard: ap_get_scoreboard_worker(sbh) now takes the sbh member
      from the connection rec, ap_get_scoreboard_worker(proc, thread) will now
-     provide the unusual legacy lookup.  Also cleans up PR 31127 range checks.
-     [William Rowe, Christian von Roques <roques mti.ag>]
+     provide the unusual legacy lookup.  [William Rowe]
 
   *) mod_proxy_http: Check but don't escape/unescape forward-proxied URLs
      PR 42592 [Nick Kew]

diff --git a/server/scoreboard.c b/server/scoreboard.c
index 3ad995fcf0f8895a8dc33f4f69b6499780701429..54d1fc864838f703bd17a4d9ca34e737880f33b1 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -477,8 +477,8 @@ void ap_time_process_request(ap_sb_handle_t *sbh, int status)
 
 AP_DECLARE(worker_score *) ap_get_scoreboard_worker_from_indexes(int x, int y)
 {
-    if (((x < 0) || (x > server_limit)) ||
-        ((y < 0) || (y > thread_limit))) {
+    if (((x < 0) || (x >= server_limit)) ||
+        ((y < 0) || (y >= thread_limit))) {
         return(NULL); /* Out of range */
     }
     return &ap_scoreboard_image->servers[x][y];