From: Antony Dovgal <tony2001@php.net>
Date: Sun, 19 Mar 2006 22:33:10 +0000 (+0000)
Subject: first check stream for NULL, then dereference
X-Git-Tag: php-5.1.3RC2~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef1f36e2c1d0913ab1708999775b6ffe8aca2896;p=php

first check stream for NULL, then dereference
---

diff --git a/main/network.c b/main/network.c
index 195a825180..15fa5aad97 100644
--- a/main/network.c
+++ b/main/network.c
@@ -988,10 +988,12 @@ PHPAPI php_stream *_php_stream_sock_open_from_socket(php_socket_t socket, const
 	sock->socket = socket;
 
 	stream = php_stream_alloc_rel(&php_stream_generic_socket_ops, sock, persistent_id, "r+");
-	stream->flags |= PHP_STREAM_FLAG_AVOID_BLOCKING;
 
-	if (stream == NULL)	
+	if (stream == NULL) {
 		pefree(sock, persistent_id ? 1 : 0);
+	} else {
+		stream->flags |= PHP_STREAM_FLAG_AVOID_BLOCKING;
+	}
 
 	return stream;
 }