diff options
| author | Fabian Franz <fabian@root397.premium-rootserver.net> | 2015-11-05 18:21:45 +0000 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-11-05 19:47:12 +0100 |
| commit | 1fcadf67e652622577ab0467e40c812e132ec9f3 (patch) | |
| tree | c95bd2c114ddec12389dfd4898c02103ffc24e32 | |
| parent | f189353178bd8e88bee9590669dfd0c53b784b28 (diff) | |
| download | php-git-1fcadf67e652622577ab0467e40c812e132ec9f3.tar.gz | |
Fix setting of empty string resource.
| -rw-r--r-- | ext/pdo/pdo_sql_parser.c | 3 | ||||
| -rw-r--r-- | ext/pdo/pdo_sql_parser.re | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c index 0907571e08..22e5fcf35b 100644 --- a/ext/pdo/pdo_sql_parser.c +++ b/ext/pdo/pdo_sql_parser.c @@ -576,8 +576,7 @@ safe: buf = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0); if (!buf) { - ret = -1; - goto clean_up; + buf = ZSTR_EMPTY_ALLOC(); } if (!stmt->dbh->methods->quoter(stmt->dbh, ZSTR_VAL(buf), ZSTR_LEN(buf), &plc->quoted, &plc->qlen, param->param_type)) { diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re index 96c131fe96..629f3079c2 100644 --- a/ext/pdo/pdo_sql_parser.re +++ b/ext/pdo/pdo_sql_parser.re @@ -218,8 +218,7 @@ safe: buf = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0); if (!buf) { - ret = -1; - goto clean_up; + buf = ZSTR_EMPTY_ALLOC(); } if (!stmt->dbh->methods->quoter(stmt->dbh, ZSTR_VAL(buf), ZSTR_LEN(buf), &plc->quoted, &plc->qlen, param->param_type)) { |