From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 19 Dec 2006 09:17:04 +0000 (+0000)
Subject: Fixed bug #39869 (safe_read does not initialize errno). (michiel at boland dot org)
X-Git-Tag: php-5.2.1RC2~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=868ac7d3a370ea8382128145e35269337466683f;p=php

Fixed bug #39869 (safe_read does not initialize errno). (michiel at boland dot org)
---

diff --git a/NEWS b/NEWS
index afb8a502ad..16bf5a31d1 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ PHP                                                                        NEWS
   . cookies
   . canary protection (debug build only)
   . random generation of cookies and canaries
+- Fixed bug #39869 (safe_read does not initialize errno).
+  (michiel at boland dot org, Dmitry)
 - Fixed bug #39850 (SplFileObject throws contradictory/wrong error messages 
   when trying to open "php://wrong"). (Tony)
 - Fixed bug #39832 (SOAP Server: parameter not matching the WSDL specified type
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
index 381e1ddcec..9b6071f0a6 100644
--- a/sapi/cgi/fastcgi.c
+++ b/sapi/cgi/fastcgi.c
@@ -347,6 +347,7 @@ static inline ssize_t safe_write(fcgi_request *req, const void *buf, size_t coun
 	size_t n = 0;
 
 	do {
+		errno = 0;
 		ret = write(req->fd, ((char*)buf)+n, count-n);
 		if (ret > 0) {
 			n += ret;
@@ -363,6 +364,7 @@ static inline ssize_t safe_read(fcgi_request *req, const void *buf, size_t count
 	size_t n = 0;
 
 	do {
+		errno = 0;
 		ret = read(req->fd, ((char*)buf)+n, count-n);
 		if (ret > 0) {
 			n += ret;