diff options
| author | Remi Collet <remi@php.net> | 2015-05-20 08:08:41 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-05-20 08:08:41 +0200 |
| commit | 2cc4e69cc6d8dbc4b3568ad3dd583324a7c11d64 (patch) | |
| tree | de81a30d5e522eab337519c5ab989b1fa015b42d /ext/pgsql/pgsql.c | |
| parent | 58e5e006e540dbec3f4c17cbd8f640e5f03a38d6 (diff) | |
| download | php-git-2cc4e69cc6d8dbc4b3568ad3dd583324a7c11d64.tar.gz | |
Fixed Bug #69667 segfault in php_pgsql_meta_data
Incomplete fix for #68741
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 23d55cb184..5418b3c211 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -5120,7 +5120,11 @@ PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, z src = estrdup(table_name); tmp_name = php_strtok_r(src, ".", &tmp_name2); - + if (!tmp_name) { + efree(src); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The table name must be specified"); + return FAILURE; + } if (!tmp_name2 || !*tmp_name2) { /* Default schema */ tmp_name2 = tmp_name; @@ -6130,7 +6134,8 @@ static int do_exec(smart_str *querystr, int expect, PGconn *pg_link, ulong opt T static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const char *table) { - char *table_copy, *escaped, *token, *tmp; + char *table_copy, *escaped, *tmp; + const char *token; size_t len; /* schame.table should be "schame"."table" */ |