use temp var instead of wrong typecast

This commit is contained in:
Antony Dovgal 2009-01-09 22:50:45 +00:00
parent 4edee64c6c
commit ae66becc2b

View file

@ -911,7 +911,7 @@ PHP_FUNCTION(tempnam)
{ {
zval **ppdir, **ppprefix; zval **ppdir, **ppprefix;
char *dir, *prefix; char *dir, *prefix;
int dir_len; int dir_len, tmp_prefix_len;
char *opened_path; char *opened_path;
char *p; char *p;
int fd; int fd;
@ -922,7 +922,7 @@ PHP_FUNCTION(tempnam)
} }
if (php_stream_path_param_encode(ppdir, &dir, &dir_len, REPORT_ERRORS, FG(default_context)) == FAILURE || if (php_stream_path_param_encode(ppdir, &dir, &dir_len, REPORT_ERRORS, FG(default_context)) == FAILURE ||
php_stream_path_param_encode(ppprefix, &prefix, (int *)&prefix_len, REPORT_ERRORS, FG(default_context)) == FAILURE) { php_stream_path_param_encode(ppprefix, &prefix, &tmp_prefix_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
RETURN_FALSE; RETURN_FALSE;
} }
@ -930,6 +930,7 @@ PHP_FUNCTION(tempnam)
RETURN_FALSE; RETURN_FALSE;
} }
prefix_len = tmp_prefix_len;
php_basename(prefix, prefix_len, NULL, 0, &p, &p_len TSRMLS_CC); php_basename(prefix, prefix_len, NULL, 0, &p, &p_len TSRMLS_CC);
if (p_len > 64) { if (p_len > 64) {
p[63] = '\0'; p[63] = '\0';