diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-25 13:51:55 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-25 13:52:08 +0200 |
| commit | 1086e4ec886c86653e0f5bb161d067982efbf1ed (patch) | |
| tree | cb1286b472c2697a6b9510494aea8e3acc7315d0 /ext/odbc/php_odbc.c | |
| parent | 54cbee526a8b618a228254bce1df79d53ddecade (diff) | |
| parent | a49555a9e1547a513e2f22d0a2a3ef92cddbec3d (diff) | |
| download | php-git-1086e4ec886c86653e0f5bb161d067982efbf1ed.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #80147: BINARY strings may not be properly zero-terminated
Diffstat (limited to 'ext/odbc/php_odbc.c')
| -rw-r--r-- | ext/odbc/php_odbc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index d8cbe65c58..938601e2a6 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2220,6 +2220,7 @@ PHP_FUNCTION(odbc_result) if (rc != SQL_SUCCESS_WITH_INFO) { field_str = zend_string_truncate(field_str, result->values[field_ind].vallen, 0); } + ZSTR_VAL(field_str)[ZSTR_LEN(field_str)] = '\0'; RETURN_NEW_STR(field_str); break; |