diff options
| author | Xinchen Hui <laruence@php.net> | 2015-05-06 10:51:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-05-06 10:51:52 +0800 |
| commit | 55d94a453243cafc2292920e9c91bd2bc551f2be (patch) | |
| tree | c00d368a3c68c2e53167b8da8c6448cdb88801e7 /ext/pdo_sqlite/sqlite_statement.c | |
| parent | 9b3a92a1cad96ff88a61493bf688bc0757933642 (diff) | |
| parent | 63282d3321044681e880a997a6360d4b99a07d4f (diff) | |
| download | php-git-55d94a453243cafc2292920e9c91bd2bc551f2be.tar.gz | |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'ext/pdo_sqlite/sqlite_statement.c')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 29300c198a..f42ad05329 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -233,6 +233,7 @@ static int pdo_sqlite_stmt_fetch(pdo_stmt_t *stmt, static int pdo_sqlite_stmt_describe(pdo_stmt_t *stmt, int colno) { pdo_sqlite_stmt *S = (pdo_sqlite_stmt*)stmt->driver_data; + char *str; if(colno >= sqlite3_column_count(S->stmt)) { /* error invalid column */ @@ -240,8 +241,8 @@ static int pdo_sqlite_stmt_describe(pdo_stmt_t *stmt, int colno) return 0; } - stmt->columns[colno].name = estrdup(sqlite3_column_name(S->stmt, colno)); - stmt->columns[colno].namelen = strlen(stmt->columns[colno].name); + str = sqlite3_column_name(S->stmt, colno); + stmt->columns[colno].name = zend_string_init(str, strlen(str), 0); stmt->columns[colno].maxlen = 0xffffffff; stmt->columns[colno].precision = 0; |