com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_dbl ib/dblib_stmt.c

From: Date: Sun, 18 Oct 2015 09:28:57 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_dbl ib/dblib_stmt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89429@lists.php.net to get a copy of this message
Commit: af8937c0568fc33682c880ff42ba1c845be1b356 Author: Anatol Belski <ab@php.net> Sun, 18 Oct 2015 11:28:57 +0200 Parents: c100a742dceaa0bb8dac5251b676155f4c1a8cd3 7f33ab834d87452082526205c256a4827fb71142 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af8937c0568fc33682c880ff42ba1c845be1b356 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: C89 compat use spprintf instead (no need to estrdup afterwards). dblib's dbcolname can return null in some cases testcase fot bug #69757 Segmentation fault on pdo_dblib::nextRowset (bug #69757) Conflicts: ext/pdo_dblib/dblib_stmt.c Bugs: https://bugs.php.net/69757 Changed paths: MM ext/pdo_dblib/dblib_stmt.c Diff: diff --cc ext/pdo_dblib/dblib_stmt.c index 9777654,d6c2c70..bc709aa --- a/ext/pdo_dblib/dblib_stmt.c +++ b/ext/pdo_dblib/dblib_stmt.c @@@ -197,13 -203,19 +197,23 @@@ static int pdo_dblib_stmt_describe(pdo_ if(colno >= stmt->column_count || colno < 0) { return FAILURE; } - + col = &stmt->columns[colno]; - str = dbcolname(H->link, colno+1); - col->name = zend_string_init(str, strlen(str), 0); + fname = (char*)dbcolname(H->link, colno+1); + + if (fname && *fname) { - col->name = estrdup(fname); - col->namelen = strlen(col->name); ++ col->name = zend_string_init(fname, strlen(fname), 0); + } else { - col->namelen = spprintf(&col->name, NULL, "computed%d", colno); ++ char buf[16]; ++ int len; ++ ++ len = snprintf(buf, sizeof(buf), "computed%d", colno); ++ col->name = zend_string_init(buf, len, 0); + } ++ col->maxlen = dbcollen(H->link, colno+1); col->param_type = PDO_PARAM_STR; - + return 1; }

« previous php.cvs (#89429) next »