cvs: php4(PHP_4_3) /ext/pgsql pgsql.c

jay Thu Apr 17 12:55:56 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/pgsql pgsql.c Log: MFH: fix some segfaults in some pg_lo_* functions Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.244.2.15 php4/ext/pgsql/pgsql.c:1.244.2.16 --- php4/ext/pgsql/pgsql.c:1.244.2.15 Tue Apr 1 19:00:09 2003 +++ php4/ext/pgsql/pgsql.c Thu Apr 17 12:55:56 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.244.2.15 2003/04/02 00:00:09 jay Exp $ */ +/* $Id: pgsql.c,v 1.244.2.16 2003/04/17 16:55:56 jay Exp $ */ #include <stdlib.h> @@ -1776,6 +1776,10 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 1 or 2 arguments."); RETURN_FALSE; } + + if (pgsql_link == NULL) { + RETURN_FALSE; + } ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); @@ -1845,6 +1849,10 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 1 or 2 arguments."); RETURN_FALSE; } + + if (pgsql_link == NULL) { + RETURN_FALSE; + } ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); @@ -2073,6 +2081,10 @@ else { WRONG_PARAM_COUNT; } + + if (pgsql_link == NULL) { + RETURN_FALSE; + } if (PG(safe_mode) &&(!php_checkuid(file_in, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { RETURN_FALSE; @@ -2135,7 +2147,7 @@ CHECK_DEFAULT_LINK(id); } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, - "ss", &pgsql_link, &oid_string, &oid_strlen, &file_out, &name_len) == SUCCESS) { + "ss", &oid_string, &oid_strlen, &file_out, &name_len) == SUCCESS) { oid = (Oid)strtoul(oid_string, &end_ptr, 10); if ((oid_string+oid_strlen) != end_ptr) { /* wrong integer format */ @@ -2165,6 +2177,10 @@ } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 2 or 3 arguments."); + RETURN_FALSE; + } + + if (pgsql_link == NULL) { RETURN_FALSE; }