[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c

[Ilia Alshanetsky]

iliaa           Tue Oct 11 12:18:45 2005 EDT

  Modified files:              
    /php-src/ext/pgsql  pgsql.c 
  Log:
  Fixed bug #33167 (Possible crash inside pg_fetch_array()).
  
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.332&r2=1.333&ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.332 php-src/ext/pgsql/pgsql.c:1.333
--- php-src/ext/pgsql/pgsql.c:1.332     Fri Aug 12 10:08:23 2005
+++ php-src/ext/pgsql/pgsql.c   Tue Oct 11 12:18:40 2005
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: pgsql.c,v 1.332 2005/08/12 14:08:23 sebastian Exp $ */
+/* $Id: pgsql.c,v 1.333 2005/10/11 16:18:40 iliaa Exp $ */
 
 #include <stdlib.h>
 
@@ -1872,11 +1872,11 @@
 /* {{{ void php_pgsql_fetch_hash */
 static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long 
result_type, int into_object)
 {
-       zval                *result, *zrow;
+       zval                *result;
        PGresult            *pgsql_result;
        pgsql_result_handle *pg_result;
        int             i, num_fields, pgsql_row, use_row;
-       long            row;
+       long            row = -1;
        char            *element, *field_name;
        uint            element_len;
        zval            *ctor_params = NULL;
@@ -1886,9 +1886,9 @@
                char *class_name;
                int class_name_len;
 
-               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|zsz", 
&result, &zrow, &class_name, &class_name_len, &ctor_params) == FAILURE) {
+               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lsz", 
&result, &row, &class_name, &class_name_len, &ctor_params) == FAILURE) {
                        return;
-               }
+                       }
                if (ZEND_NUM_ARGS() < 3) {
                        ce = zend_standard_class_def;
                } else {
@@ -1900,15 +1900,11 @@
                }
                result_type = PGSQL_ASSOC;
        } else {
-               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|zl", 
&result, &zrow, &result_type) == FAILURE) {
+               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|ll", 
&result, &row, &result_type) == FAILURE) {
                        return;
                }
        }
-       use_row = ZEND_NUM_ARGS() > 1 && Z_TYPE_P(zrow) != IS_NULL;
-       if (use_row) {
-               convert_to_long_ex(&zrow);
-               row = Z_LVAL_P(zrow);
-       }
+       use_row = ZEND_NUM_ARGS() > 1 && row != -1;
 
        if (!(result_type & PGSQL_BOTH)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid result 
type");

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php