From: Andrey Hristov <andrey@php.net>
Date: Thu, 8 Nov 2007 17:29:42 +0000 (+0000)
Subject: Fix segfault in debug build
X-Git-Tag: RELEASE_1_3_1~686
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d2bcdacc1ae3621a01862044e71b65e6d46eb83;p=php

Fix segfault in debug build
---

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 5d4e3c5988..302ee4eb52 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -571,6 +571,10 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn,
 											    NULL /*ctx*/, &errstr, &errcode);
 	DBG_INF_FMT("stream=%p", conn->net.stream);
 
+	if (errstr || !conn->net.stream) {
+		goto err;
+	}
+
 	if (hashed_details) {
 		/*
 		  If persistent, the streams register it in EG(persistent_list).
@@ -597,10 +601,6 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn,
 		mnd_efree(hashed_details);
 	}
 
-	if (errstr || !conn->net.stream) {
-		goto err;
-	}
-
 	if (conn->options.timeout_read)
 	{
 		tv.tv_sec = conn->options.timeout_read;