summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2011-03-14 14:12:42 +0000
committerFelipe Pena <felipe@php.net>2011-03-14 14:12:42 +0000
commit0be5ca5b3c4dd174f4e50e6a69be2951f6bbecc7 (patch)
tree408cc84f0c877d82c3e352f3440ea409b462fb74
parentfe91aeaaac0ae6a6631d8b101b9e1581b5248a2a (diff)
downloadphp-git-0be5ca5b3c4dd174f4e50e6a69be2951f6bbecc7.tar.gz
- Missing fixes for bug #54247
-rw-r--r--ext/phar/phar_object.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 5a02977afe..732e6a3cd6 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -308,7 +308,7 @@ static int phar_file_action(phar_archive_data *phar, phar_entry_info *info, char
char *error;
if (!phar_open_jit(phar, info, &error TSRMLS_CC)) {
if (error) {
- zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error);
+ zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "%s", error);
efree(error);
}
return -1;
@@ -675,7 +675,7 @@ PHP_METHOD(Phar, webPhar)
if (phar_open_executed_filename(alias, alias_len, &error TSRMLS_CC) != SUCCESS) {
if (error) {
- zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error);
+ zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "%s", error);
efree(error);
}
return;
@@ -1097,7 +1097,7 @@ PHP_METHOD(Phar, createDefaultStub)
stub = phar_create_default_stub(index, webindex, &stub_len, &error TSRMLS_CC);
if (error) {
- zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error);
+ zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "%s", error);
efree(error);
return;
}
@@ -1122,7 +1122,7 @@ PHP_METHOD(Phar, mapPhar)
RETVAL_BOOL(phar_open_executed_filename(alias, alias_len, &error TSRMLS_CC) == SUCCESS);
if (error) {
- zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error);
+ zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "%s", error);
efree(error);
}
} /* }}} */