]> granicus.if.org Git - php/commitdiff
Avoid estrdup(NULL), modified patch from Zhao ming sen.
authorWez Furlong <wez@php.net>
Tue, 12 Jul 2005 11:02:23 +0000 (11:02 +0000)
committerWez Furlong <wez@php.net>
Tue, 12 Jul 2005 11:02:23 +0000 (11:02 +0000)
ext/pdo_dblib/pdo_dblib.c

index 3c3987774d308259a3852af7a9b6438b1bf5125a..31de2c8ecd4e309bd99e01f798847c724e003edb 100644 (file)
@@ -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: