clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up pg_escape_*()

Browse Source
This commit is contained in:
Yasuo Ohgaki 2002-04-04 13:54:51 +00:00
parent afeda57153
commit fafea27a2d
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ext/pgsql/pgsql.c
View File

@ -2391,19 +2391,15 @@ PHP_FUNCTION(pg_copy_from)
PHP_FUNCTION(pg_escape_string)
{
char *from = NULL, *to = NULL;
int len;
size_t from_len, to_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&from, &len) == FAILURE) {
&from, &from_len) == FAILURE) {
return;
}
to = (char *)emalloc(len*2+1);
len = (int)PQescapeString(to, from, strlen(from));
if (len < 0) {
efree(to);
RETURN_FALSE;
}
RETURN_STRINGL(to, len, 0);
to = (char *)emalloc(from_len*2+1);
to_len = (int)PQescapeString(to, from, from_len);
RETURN_STRINGL(to, to_len, 0);
}
/* }}} */
@ -2412,18 +2408,14 @@ PHP_FUNCTION(pg_escape_string)
PHP_FUNCTION(pg_escape_bytea)
{
char *from = NULL, *to = NULL;
int len;
size_t from_len, to_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&from, &len) == FAILURE) {
&from, &from_len) == FAILURE) {
return;
}
to = (char *)PQescapeBytea((unsigned char*)from, strlen(from), (size_t *)&len);
if (len < 0) {
/* Don't need to free "to" here*/
RETURN_FALSE;
}
RETURN_STRINGL(to, len, 1);
to = (char *)PQescapeBytea((unsigned char*)from, from_len, &to_len);
RETVAL_STRINGL(to, to_len-1, 1); /* to_len includes addtional '\0' */
free(to);
}
/* }}} */