]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merge r1872394 from trunk
authorChristophe Jaillet <jailletc36@apache.org>
Sun, 8 Mar 2020 10:29:54 +0000 (10:29 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Sun, 8 Mar 2020 10:29:54 +0000 (10:29 +0000)
   * In winnt_accept() (server/mpm/winnt/child.c), there's a call to PostQueuedCompletionStatus() with a buffer (BytesRead) for the number of bytes read.

When compiling the code with Visual Studio 2019 (v 16.3.10), we get a warning than BytesRead is not initialized. When using /RTCu (run-time checks for uninitialzed variables), the program crashes on this line with an exception.

If we initialize the variable to 0, the problem is solved.

PR: 63965
Submitted by: gbechis
Reviewed by: gbechis,jailletc36 (+ CTR rule for non-Unix, single-platform code)
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874971 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/winnt/child.c

index 21755f398ce166caa341a24570b9cf42f3079305..ad03d24e1c06bf5cbb145a3563138b2d4114b276 100644 (file)
@@ -352,7 +352,7 @@ static unsigned int __stdcall winnt_accept(void *lr_)
     ap_listen_rec *lr = (ap_listen_rec *)lr_;
     apr_os_sock_info_t sockinfo;
     winnt_conn_ctx_t *context = NULL;
-    DWORD BytesRead;
+    DWORD BytesRead = 0;
     SOCKET nlsd;
     LPFN_ACCEPTEX lpfnAcceptEx = NULL;
     LPFN_GETACCEPTEXSOCKADDRS lpfnGetAcceptExSockaddrs = NULL;