From: Felipe Pena <felipe@php.net>
Date: Fri, 24 Oct 2008 10:44:19 +0000 (+0000)
Subject: - Fixed bug #46082 (stream_set_blocking() can cause a crash in some circumstances)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66f75b6e8ea2f28b08e813372f33e7e2d0f56d2b;p=php

- Fixed bug #46082 (stream_set_blocking() can cause a crash in some circumstances)
---

diff --git a/main/network.c b/main/network.c
index 1ce446494f..7dc0954d39 100644
--- a/main/network.c
+++ b/main/network.c
@@ -1057,7 +1057,11 @@ PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC)
 	/* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */
 	flags = !block;
 	if (ioctlsocket(socketd, FIONBIO, &flags) == SOCKET_ERROR) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", WSAGetLastError());
+		char *error_string;
+		
+		error_string = php_socket_strerror(WSAGetLastError(), NULL, 0);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", error_string);
+		efree(error_string);
 		ret = FAILURE;
 	}
 #else