cvs: php-src /ext/pdo_dblib pdo_dblib.c
| From: | Wez Furlong | Date: | Tue, 12 Jul 2005 11:02:23 +0000 |
| Subject: | cvs: php-src /ext/pdo_dblib pdo_dblib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32878@lists.php.net to get a copy of this message | ||
wez Tue Jul 12 07:02:23 2005 EDT
Modified files:
/php-src/ext/pdo_dblib pdo_dblib.c
Log:
Avoid estrdup(NULL), modified patch from Zhao ming sen.
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.4 php-src/ext/pdo_dblib/pdo_dblib.c:1.5
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.4 Sun Feb 13 18:13:14 2005
+++ php-src/ext/pdo_dblib/pdo_dblib.c Tue Jul 12 07:02:23 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dblib.c,v 1.4 2005/02/13 23:13:14 wez Exp $ */
+/* $Id: pdo_dblib.c,v 1.5 2005/07/12 11:02:23 wez Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -78,8 +78,16 @@
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: