From: Wez Furlong <wez@php.net>
Date: Tue, 12 Jul 2005 11:02:23 +0000 (+0000)
Subject: Avoid estrdup(NULL), modified patch from Zhao ming sen.
X-Git-Tag: php-5.1.0b3~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93962139fb4938ee7de0e9bbf2df5135c0ffaf41;p=php

Avoid estrdup(NULL), modified patch from Zhao ming sen.
---

diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c
index 3c3987774d..31de2c8ecd 100644
--- a/ext/pdo_dblib/pdo_dblib.c
+++ b/ext/pdo_dblib/pdo_dblib.c
@@ -78,8 +78,16 @@ int error_handler(DBPROCESS *dbproc, int severity, int dberr,
 	if (einfo->dberrstr) {
 		efree(einfo->dberrstr);
 	}
-	einfo->oserrstr = estrdup(oserrstr);
-	einfo->dberrstr = estrdup(dberrstr);
+	if (oserrstr) {
+		einfo->oserrstr = estrdup(oserrstr);
+	} else {
+		einfo->oserrstr = NULL;
+	}
+	if (dberrstr) {
+		einfo->dberrstr = estrdup(dberrstr);
+	} else {
+		einfo->dberrstr = NULL;
+	}
 
 	switch (dberr) {
 		case SYBESEOF: