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

Fixed Hash API usage

Browse source
This commit is contained in:
Xinchen Hui 2014-05-18 20:23:26 +08:00
parent 4ababc3a41
commit af3829608d
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/pdo/pdo_sql_parser.c
View file

@ -780,8 +780,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
padding = 3; padding = 3;
} }
if(params) { if(params) {
HashPosition *param_pos;
zend_hash_internal_pointer_reset(params); zend_hash_internal_pointer_reset(params);
while (SUCCESS == zend_hash_get_current_data(params, (void**)&param)) { while ((param == zend_hash_get_current_data_ptr_ex(params, &param_pos)) != NULL) {
if(param->parameter) { if(param->parameter) {
convert_to_string(param->parameter); convert_to_string(param->parameter);
/* accommodate a string that needs to be fully quoted /* accommodate a string that needs to be fully quoted
@ -813,9 +814,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
} }
/* lookup bind first via hash and then index */ /* lookup bind first via hash and then index */
/* stupid keys need to be null-terminated, even though we know their length */ /* stupid keys need to be null-terminated, even though we know their length */
if((SUCCESS == zend_hash_find(params, s.tok, s.cur-s.tok,(void **)&param)) if((NULL != (param = zend_hash_str_find_ptr(params, s.tok, s.cur-s.tok))
|| ||
(SUCCESS == zend_hash_index_find(params, bindno, (void **)&param))) NULL != (params = zend_hash_index_find_ptr(params, bindno)))
{ {
char *quotedstr; char *quotedstr;
int quotedstrlen; int quotedstrlen;
@ -852,7 +853,7 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
return (int) (s.cur - inquery); return (int) (s.cur - inquery);
} }
/* lookup bind by index */ /* lookup bind by index */
if(SUCCESS == zend_hash_index_find(params, bindno, (void **)&param)) if(NULL != zend_hash_index_find(params, bindno, (void **)&param))
{ {
char *quotedstr; char *quotedstr;
int quotedstrlen; int quotedstrlen;