felipe                                   Mon, 14 Mar 2011 14:12:42 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=309222

Log:
- Missing fixes for bug #54247

Bug: http://bugs.php.net/54247 (error getting bug information)
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
    U   php/php-src/trunk/ext/phar/phar_object.c

Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2011-03-14 13:54:41 UTC 
(rev 309221)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2011-03-14 14:12:42 UTC 
(rev 309222)
@@ -307,7 +307,7 @@
                                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;
@@ -673,7 +673,7 @@

        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;
@@ -1095,7 +1095,7 @@
        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;
        }
@@ -1120,7 +1120,7 @@
        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);
        }
 } /* }}} */

Modified: php/php-src/trunk/ext/phar/phar_object.c
===================================================================
--- php/php-src/trunk/ext/phar/phar_object.c    2011-03-14 13:54:41 UTC (rev 
309221)
+++ php/php-src/trunk/ext/phar/phar_object.c    2011-03-14 14:12:42 UTC (rev 
309222)
@@ -308,7 +308,7 @@
                                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 @@

        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 @@
        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 @@
        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);
        }
 } /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to