diff options
Diffstat (limited to 'ext/pdo_firebird')
| -rw-r--r-- | ext/pdo_firebird/config.m4 | 2 | ||||
| -rw-r--r-- | ext/pdo_firebird/firebird_driver.c | 3 | ||||
| -rw-r--r-- | ext/pdo_firebird/firebird_statement.c | 4 | ||||
| -rw-r--r-- | ext/pdo_firebird/pdo_firebird.c | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index e878bfb85..875f6fcb1 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4 291414 2009-11-29 06:13:22Z rasmus $ +dnl $Id: config.m4 311041 2011-05-15 05:49:34Z rasmus $ dnl PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO, diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index 542f88a79..0efd6a158 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: firebird_driver.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: firebird_driver.c 312225 2011-06-17 02:00:20Z felipe $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -232,6 +232,7 @@ static long firebird_handle_doer(pdo_dbh_t *dbh, const char *sql, long sql_len T /* TODO no placeholders in exec() for now */ in_sqlda.version = out_sqlda.version = PDO_FB_SQLDA_VERSION; in_sqlda.sqld = out_sqlda.sqld = 0; + out_sqlda.sqln = 1; /* allocate and prepare statement */ if (!firebird_alloc_prepare_stmt(dbh, sql, sql_len, &out_sqlda, &stmt, 0 TSRMLS_CC)) { diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 06c252fd0..562b047a9 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: firebird_statement.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: firebird_statement.c 312225 2011-06-17 02:00:20Z felipe $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -191,7 +191,7 @@ static int firebird_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) /* {{{ char *cp; /* allocate storage for the column */ - var->sqlind = (void*)emalloc(var->sqllen + 2*sizeof(short)); + var->sqlind = (void*)ecalloc(1, var->sqllen + 2*sizeof(short)); var->sqldata = &((char*)var->sqlind)[sizeof(short)]; colname_len = (S->H->fetch_table_names && var->relname_length) diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c index bb5ae306c..8dd35aff7 100644 --- a/ext/pdo_firebird/pdo_firebird.c +++ b/ext/pdo_firebird/pdo_firebird.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_firebird.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: pdo_firebird.c 314376 2011-08-06 14:47:44Z felipe $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,7 +31,7 @@ #include "php_pdo_firebird_int.h" const zend_function_entry pdo_firebird_functions[] = { /* {{{ */ - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ @@ -40,7 +40,7 @@ const zend_function_entry pdo_firebird_functions[] = { /* {{{ */ #if ZEND_MODULE_API_NO >= 20050922 static const zend_module_dep pdo_firebird_deps[] = { ZEND_MOD_REQUIRED("pdo") - {NULL, NULL, NULL} + ZEND_MOD_END }; #endif /* }}} */ |