From af0921a3e92e5e5c42904e2c0a2854879155de89 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Jun 2018 17:28:27 +0200 Subject: update to 2.0.5-dev for PHP 7.3 add patch for -Wformat errors from https://github.com/laruence/taint/pull/64 --- 64.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 64.patch (limited to '64.patch') diff --git a/64.patch b/64.patch new file mode 100644 index 0000000..4238991 --- /dev/null +++ b/64.patch @@ -0,0 +1,31 @@ +From 389dfe16c97c0ba517fe94f49766cc74e6ed3327 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 27 Jun 2018 17:17:59 +0200 +Subject: [PATCH] fix -Wformat warning + +--- + taint.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/taint.c b/taint.c +index e4b0765..f404cc4 100644 +--- a/taint.c ++++ b/taint.c +@@ -248,7 +248,7 @@ static zval *php_taint_fetch_dimension_address_inner(HashTable *ht, const zval * + hval = zend_dval_to_lval(Z_DVAL_P(dim)); + goto num_index; + case IS_RESOURCE: +- zend_error(E_NOTICE, "Resource ID#%pd used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); ++ zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + hval = Z_RES_HANDLE_P(dim); + goto num_index; + case IS_FALSE: +@@ -610,7 +610,7 @@ static void php_taint_error(const char *fname, const char *format, ...) /* {{{ * + vspprintf(&buffer, 0, format, args); + spprintf(&msg, 0, "%s() [%s]: %s", get_active_function_name(), fname, buffer); + efree(buffer); +- zend_error(TAINT_G(error_level), msg); ++ zend_error(TAINT_G(error_level), "%s", msg); + efree(msg); + va_end(args); + } /* }}} */ -- cgit