diff options
Diffstat (limited to 'ext/standard/iptc.c')
| -rw-r--r-- | ext/standard/iptc.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c index 405c1a71d..824598b4f 100644 --- a/ext/standard/iptc.c +++ b/ext/standard/iptc.c @@ -181,23 +181,16 @@ PHP_FUNCTION(iptcembed) int iptcdata_len, jpeg_file_len; long spool = 0; FILE *fp; - unsigned int marker, done = 0, inx; + unsigned int marker, done = 0; + int inx; unsigned char *spoolbuf = NULL, *poi = NULL; struct stat sb; zend_bool written = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &iptcdata, &iptcdata_len, &jpeg_file, &jpeg_file_len, &spool) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sp|l", &iptcdata, &iptcdata_len, &jpeg_file, &jpeg_file_len, &spool) != SUCCESS) { return; } - if (strlen(jpeg_file) != jpeg_file_len) { - RETURN_FALSE; - } - - if (PG(safe_mode) && (!php_checkuid(jpeg_file, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { - RETURN_FALSE; - } - if (php_check_open_basedir(jpeg_file TSRMLS_CC)) { RETURN_FALSE; } @@ -303,7 +296,8 @@ PHP_FUNCTION(iptcembed) Parse binary IPTC-data into associative array */ PHP_FUNCTION(iptcparse) { - unsigned int inx = 0, len, tagsfound = 0; + int inx = 0, len; + unsigned int tagsfound = 0; unsigned char *buffer, recnum, dataset, key[ 16 ]; char *str; int str_len; |