mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made ibase_timefmt() check its args more thoroughly and nuked a pointless malloc()

Browse Source
This commit is contained in:
Ard Biesheuvel 2004-05-12 13:14:55 +00:00
parent ecfd014357
commit b4939dfa9a
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ext/interbase/interbase.c
View File

@ -1136,34 +1136,18 @@ PHP_FUNCTION(ibase_rollback_ret)
#endif
/* }}} */
#if HAVE_STRFTIME
/* {{{ proto bool ibase_timefmt(string format [, int type ])
Sets the format of timestamp, date and time columns returned from queries */
PHP_FUNCTION(ibase_timefmt)
{
zval ***args;
char *fmt = NULL;
int type = PHP_IBASE_TIMESTAMP;
char *fmt;
int fmt_len;
long type = PHP_IBASE_TIMESTAMP;
if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 2) {
WRONG_PARAM_COUNT;
}
args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
efree(args);
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &fmt, &fmt_len, &type)) {
RETURN_FALSE;
}
switch (ZEND_NUM_ARGS()) {
case 2:
convert_to_long_ex(args[1]);
type = Z_LVAL_PP(args[1]);
case 1:
convert_to_string_ex(args[0]);
fmt = Z_STRVAL_PP(args[0]);
}
switch (type) {
case PHP_IBASE_TIMESTAMP:
if (IBG(timestampformat)) {
@ -1183,13 +1167,13 @@ PHP_FUNCTION(ibase_timefmt)
}
IBG(timeformat) = DL_STRDUP(fmt);
break;
default:
RETURN_FALSE;
}
efree(args);
RETURN_TRUE;
}
/* }}} */
#endif
/* {{{ proto int ibase_gen_id(string generator [, int increment [, resource link_identifier ]])
Increments the named generator and returns its new value */