archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fix possible SEGV

Browse source
This commit is contained in:
Marcus Boerger 2006-04-10 19:48:27 +00:00
parent af871bf437
commit 40678e7f81
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/pgsql/pgsql.c
View file

@ -4586,7 +4586,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
char *field = NULL; char *field = NULL;
uint field_len = -1; uint field_len = -1;
ulong num_idx = -1; ulong num_idx = -1;
zval *meta, **def, **type, **not_null, **has_default, **val, *new_val; zval *meta, **def, **type, **not_null, **has_default, **val, *new_val = NULL;
int new_len, key_type, err = 0, skip_field; int new_len, key_type, err = 0, skip_field;
assert(pg_link != NULL); assert(pg_link != NULL);
@ -4646,7 +4646,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
if (err) { if (err) {
break; /* break out for() */ break; /* break out for() */
} }
MAKE_STD_ZVAL(new_val); ALLOC_INIT_ZVAL(new_val);
switch(php_pgsql_get_data_type(Z_STRVAL_PP(type), Z_STRLEN_PP(type))) switch(php_pgsql_get_data_type(Z_STRVAL_PP(type), Z_STRLEN_PP(type)))
{ {
case PG_BOOL: case PG_BOOL:
@ -5178,7 +5178,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
break; break;
} /* switch */ } /* switch */
if (err) { if (err && new_val) {
zval_dtor(new_val); zval_dtor(new_val);
FREE_ZVAL(new_val); FREE_ZVAL(new_val);
break; /* break out for() */ break; /* break out for() */