From 22fc7126f7ba6796ab940906ccd4599f2398de27 Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Fri, 23 Sep 2016 17:54:36 +0200 Subject: use ZEND_STRL instead of "" + sizeof()-1 --- crypt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crypt.c b/crypt.c index 7dd83f0..318bd6c 100644 --- a/crypt.c +++ b/crypt.c @@ -30,7 +30,7 @@ static void suhosin_get_ipv4(char *buf TSRMLS_DC) { - char *raddr = suhosin_getenv("REMOTE_ADDR", sizeof("REMOTE_ADDR")-1 TSRMLS_CC); + char *raddr = suhosin_getenv(ZEND_STRL("REMOTE_ADDR") TSRMLS_CC); int i; @@ -232,15 +232,15 @@ char *suhosin_generate_key(char *key, zend_bool ua, zend_bool dr, long raddr, ch suhosin_SHA256_CTX ctx; if (ua) { - _ua = suhosin_getenv("HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT")-1 TSRMLS_CC); + _ua = suhosin_getenv(ZEND_STRL("HTTP_USER_AGENT") TSRMLS_CC); } if (dr) { - _dr = suhosin_getenv("DOCUMENT_ROOT", sizeof("DOCUMENT_ROOT")-1 TSRMLS_CC); + _dr = suhosin_getenv(ZEND_STRL("DOCUMENT_ROOT") TSRMLS_CC); } if (raddr > 0) { - _ra = suhosin_getenv("REMOTE_ADDR", sizeof("REMOTE_ADDR")-1 TSRMLS_CC); + _ra = suhosin_getenv(ZEND_STRL("REMOTE_ADDR") TSRMLS_CC); } SDEBUG("(suhosin_generate_key) KEY: %s - UA: %s - DR: %s - RA: %s", key,_ua,_dr,_ra); -- cgit v1.3