mirror of
https://github.com/php/php-src.git
synced 2025-08-20 09:24:05 +02:00
- Added missing void param checks, and fix arginfo
This commit is contained in:
Felipe Pena
parent
72c4e72570
commit
8c3335b96b
1 changed files with 122 additions and 2 deletions
|
|
@ -1075,6 +1075,9 @@ PHP_METHOD(Phar, mungServer)
|
|||
*/
|
||||
PHP_METHOD(Phar, interceptFileFuncs)
|
||||
{
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
phar_intercept_functions(TSRMLS_C);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -1152,6 +1155,9 @@ PHP_METHOD(Phar, loadPhar)
|
|||
* Returns the api version */
|
||||
PHP_METHOD(Phar, apiVersion)
|
||||
{
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
RETURN_STRINGL(PHP_PHAR_API_VERSION, sizeof(PHP_PHAR_API_VERSION)-1, 1);
|
||||
}
|
||||
/* }}}*/
|
||||
|
|
@ -1194,6 +1200,9 @@ PHP_METHOD(Phar, canCompress)
|
|||
* Returns whether phar extension supports writing and creating phars */
|
||||
PHP_METHOD(Phar, canWrite)
|
||||
{
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
RETURN_BOOL(!PHAR_G(readonly));
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -1401,6 +1410,10 @@ PHP_METHOD(Phar, __construct)
|
|||
*/
|
||||
PHP_METHOD(Phar, getSupportedSignatures)
|
||||
{
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
array_init(return_value);
|
||||
|
||||
add_next_index_stringl(return_value, "MD5", 3, 1);
|
||||
|
|
@ -1424,6 +1437,10 @@ PHP_METHOD(Phar, getSupportedSignatures)
|
|||
*/
|
||||
PHP_METHOD(Phar, getSupportedCompression)
|
||||
{
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
array_init(return_value);
|
||||
phar_request_initialize(TSRMLS_C);
|
||||
|
||||
|
|
@ -2088,6 +2105,10 @@ PHP_METHOD(Phar, count)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_LONG(zend_hash_num_elements(&phar_obj->arc.archive->manifest));
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -2711,6 +2732,10 @@ PHP_METHOD(Phar, isCompressed)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (phar_obj->arc.archive->flags & PHAR_FILE_COMPRESSED_GZ) {
|
||||
RETURN_LONG(PHAR_ENT_COMPRESSED_GZ);
|
||||
}
|
||||
|
|
@ -2731,6 +2756,10 @@ PHP_METHOD(Phar, isWritable)
|
|||
php_stream_statbuf ssb;
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!phar_obj->arc.archive->is_writeable) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
|
@ -2805,6 +2834,10 @@ PHP_METHOD(Phar, getAlias)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (phar_obj->arc.archive->alias && phar_obj->arc.archive->alias != phar_obj->arc.archive->fname) {
|
||||
RETURN_STRINGL(phar_obj->arc.archive->alias, phar_obj->arc.archive->alias_len, 1);
|
||||
}
|
||||
|
|
@ -2818,6 +2851,10 @@ PHP_METHOD(Phar, getPath)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_STRINGL(phar_obj->arc.archive->fname, phar_obj->arc.archive->fname_len, 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -2930,6 +2967,10 @@ PHP_METHOD(Phar, getVersion)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_STRING(phar_obj->arc.archive->version, 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -2941,6 +2982,10 @@ PHP_METHOD(Phar, startBuffering)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
phar_obj->arc.archive->donotflush = 1;
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -2952,6 +2997,10 @@ PHP_METHOD(Phar, isBuffering)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_BOOL(phar_obj->arc.archive->donotflush);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -2965,6 +3014,10 @@ PHP_METHOD(Phar, stopBuffering)
|
|||
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) {
|
||||
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC,
|
||||
"Cannot write out phar archive, phar is read-only");
|
||||
|
|
@ -3196,6 +3249,10 @@ PHP_METHOD(Phar, getSignature)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (phar_obj->arc.archive->signature) {
|
||||
char *unknown;
|
||||
int unknown_len;
|
||||
|
|
@ -3236,6 +3293,10 @@ PHP_METHOD(Phar, getModified)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_BOOL(phar_obj->arc.archive->is_modified);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -3494,6 +3555,10 @@ PHP_METHOD(Phar, decompressFiles)
|
|||
char *error;
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) {
|
||||
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC,
|
||||
"Phar is readonly, cannot change compression");
|
||||
|
|
@ -4011,6 +4076,10 @@ PHP_METHOD(Phar, getStub)
|
|||
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (phar_obj->arc.archive->is_tar || phar_obj->arc.archive->is_zip) {
|
||||
|
||||
if (SUCCESS == zend_hash_find(&(phar_obj->arc.archive->manifest), ".phar/stub.php", sizeof(".phar/stub.php")-1, (void **)&stub)) {
|
||||
|
|
@ -4107,6 +4176,10 @@ PHP_METHOD(Phar, getMetadata)
|
|||
{
|
||||
PHAR_ARCHIVE_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (phar_obj->arc.archive->metadata) {
|
||||
if (phar_obj->arc.archive->is_persistent) {
|
||||
zval *ret;
|
||||
|
|
@ -4599,6 +4672,10 @@ PHP_METHOD(PharFileInfo, getCompressedSize)
|
|||
{
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_LONG(entry_obj->ent.entry->compressed_filesize);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -4637,6 +4714,10 @@ PHP_METHOD(PharFileInfo, getCRC32)
|
|||
{
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (entry_obj->ent.entry->is_dir) {
|
||||
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, \
|
||||
"Phar entry is a directory, does not have a CRC"); \
|
||||
|
|
@ -4659,6 +4740,10 @@ PHP_METHOD(PharFileInfo, isCRCChecked)
|
|||
{
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_BOOL(entry_obj->ent.entry->is_crc_checked);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -4670,6 +4755,10 @@ PHP_METHOD(PharFileInfo, getPharFlags)
|
|||
{
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_LONG(entry_obj->ent.entry->flags & ~(PHAR_ENT_PERM_MASK|PHAR_ENT_COMPRESSION_MASK));
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -4744,6 +4833,10 @@ PHP_METHOD(PharFileInfo, hasMetadata)
|
|||
{
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RETURN_BOOL(entry_obj->ent.entry->metadata != NULL);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -4755,6 +4848,10 @@ PHP_METHOD(PharFileInfo, getMetadata)
|
|||
{
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (entry_obj->ent.entry->metadata) {
|
||||
if (entry_obj->ent.entry->is_persistent) {
|
||||
zval *ret;
|
||||
|
|
@ -4832,6 +4929,10 @@ PHP_METHOD(PharFileInfo, delMetadata)
|
|||
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (PHAR_G(readonly) && !entry_obj->ent.entry->phar->is_data) {
|
||||
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by the php.ini setting phar.readonly");
|
||||
return;
|
||||
|
|
@ -4886,6 +4987,10 @@ PHP_METHOD(PharFileInfo, getContent)
|
|||
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (entry_obj->ent.entry->is_dir) {
|
||||
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC,
|
||||
"Phar error: Cannot retrieve contents, \"%s\" in phar \"%s\" is a directory", entry_obj->ent.entry->filename, entry_obj->ent.entry->phar->fname);
|
||||
|
|
@ -5060,6 +5165,10 @@ PHP_METHOD(PharFileInfo, decompress)
|
|||
char *error;
|
||||
PHAR_ENTRY_OBJECT();
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (entry_obj->ent.entry->is_dir) {
|
||||
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, \
|
||||
"Phar entry is a directory, cannot set compression"); \
|
||||
|
|
@ -5143,6 +5252,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_createDS, 0, 0, 0)
|
|||
ZEND_ARG_INFO(0, webindex)
|
||||
ZEND_END_ARG_INFO()
|
||||
|
||||
PHAR_ARG_INFO
|
||||
ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_cancompress, 0, 0, 0)
|
||||
ZEND_ARG_INFO(0, method)
|
||||
ZEND_END_ARG_INFO()
|
||||
|
||||
PHAR_ARG_INFO
|
||||
ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_isvalidpharfilename, 0, 0, 1)
|
||||
ZEND_ARG_INFO(0, filename)
|
||||
ZEND_ARG_INFO(0, executable)
|
||||
ZEND_END_ARG_INFO()
|
||||
|
||||
PHAR_ARG_INFO
|
||||
ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_loadPhar, 0, 0, 1)
|
||||
ZEND_ARG_INFO(0, filename)
|
||||
|
|
@ -5354,13 +5474,13 @@ zend_function_entry php_archive_methods[] = {
|
|||
#endif
|
||||
/* static member functions */
|
||||
PHP_ME(Phar, apiVersion, arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, canCompress, arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, canCompress, arginfo_phar_cancompress, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, canWrite, arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, createDefaultStub, arginfo_phar_createDS, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, getSupportedCompression,arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, getSupportedSignatures,arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, interceptFileFuncs, arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, isValidPharFilename, arginfo_phar__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, isValidPharFilename, arginfo_phar_isvalidpharfilename, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, loadPhar, arginfo_phar_loadPhar, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, mapPhar, arginfo_phar_mapPhar, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
PHP_ME(Phar, running, arginfo_phar_running, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue