--- embedaddon/php/ext/pdo_dblib/pdo_dblib.c 2012/05/29 12:34:41 1.1.1.2 +++ embedaddon/php/ext/pdo_dblib/pdo_dblib.c 2013/07/22 01:31:58 1.1.1.3 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2013 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dblib.c,v 1.1.1.2 2012/05/29 12:34:41 misho Exp $ */ +/* $Id: pdo_dblib.c,v 1.1.1.3 2013/07/22 01:31:58 misho Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -93,8 +93,12 @@ int error_handler(DBPROCESS *dbproc, int severity, int char *state = "HY000"; TSRMLS_FETCH(); - einfo = (pdo_dblib_err*)dbgetuserdata(dbproc); - if (!einfo) einfo = &DBLIB_G(err); + if(dbproc) { + einfo = (pdo_dblib_err*)dbgetuserdata(dbproc); + if (!einfo) einfo = &DBLIB_G(err); + } else { + einfo = &DBLIB_G(err); + } einfo->severity = severity; einfo->oserr = oserr;