com php-src: use spprintf instead (no need to estrdup afterwards).: ext/pdo_dblib/dblib_stmt.c
| From: | Anatol Belski | Date: | Sun, 18 Oct 2015 09:10:50 +0000 |
| Subject: | com php-src: use spprintf instead (no need to estrdup afterwards).: ext/pdo_dblib/dblib_stmt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89424@lists.php.net to get a copy of this message | ||
Commit: 2b5af600e3577d105d5911d27805679c4a1c542b
Author: MiRacLe.RPZ <miracle@rpz.name> Sun, 18 Oct 2015 00:31:38 +0300
Committer: Anatol Belski <ab@php.net> Sun, 18 Oct 2015 11:10:50 +0200
Parents: 5c19355095e10d261e81959eac7d557e8b30ab9a
Branches: PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2b5af600e3577d105d5911d27805679c4a1c542b
Log:
use spprintf instead (no need to estrdup afterwards).
Changed paths:
M ext/pdo_dblib/dblib_stmt.c
Diff:
diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
index 5efded9..0b51999 100644
--- a/ext/pdo_dblib/dblib_stmt.c
+++ b/ext/pdo_dblib/dblib_stmt.c
@@ -205,15 +205,14 @@ static int pdo_dblib_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
struct pdo_column_data *col = &stmt->columns[colno];
char *fname = (char*)dbcolname(H->link, colno+1);
- char computed_buf[16];
+
if (fname && *fname) {
col->name = estrdup(fname);
+ col->namelen = strlen(col->name);
} else {
- snprintf(computed_buf,16,"computed%d", colno);
- col->name = estrdup(computed_buf);
+ 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;