Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ext/pdo_dblib/dblib_stmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,16 @@ static int pdo_dblib_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
}

struct pdo_column_data *col = &stmt->columns[colno];

col->name = (char*)dbcolname(H->link, colno+1);

char *fname = (char*)dbcolname(H->link, colno+1);

if (fname && *fname) {
col->name = estrdup(fname);
col->namelen = strlen(col->name);
} else {
col->namelen = spprintf(&col->name, NULL, "computed%d", colno);
}
col->maxlen = dbcollen(H->link, colno+1);
col->namelen = strlen(col->name);
col->param_type = PDO_PARAM_STR;

return 1;
Expand Down
32 changes: 32 additions & 0 deletions ext/pdo_dblib/tests/bug_69757.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--TEST--
PDO_DBLIB: Segmentation fault on pdo_dblib::nextRowset
--SKIPIF--
<?php
if (!extension_loaded('pdo_dblib')) die('skip not loaded');
require __DIR__ . '/config.inc';
?>
--FILE--
<?php
require __DIR__ . '/config.inc';

$sql = "
exec dbo.sp_executesql N'
SELECT * FROM sysobjects
SELECT * FROM syscolumns
'
";
$stmt = $db->query($sql);
$resultset1 = $stmt->fetchAll(PDO::FETCH_ASSOC);
if (true !== $stmt->nextRowset()) {
die('expect TRUE on nextRowset');
}
$resultset2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
if (false !== $stmt->nextRowset()) {
die('expect FALSE on nextRowset');
}
$stmt->closeCursor();

echo "OK\n";
?>
--EXPECT--
OK