From 97836fae360422baf9c62dd0eb0de6e7b2cfab09 Mon Sep 17 00:00:00 2001
From: Christian Göttsche
Date: Mon, 27 May 2024 21:32:37 +0200
Subject: Reorder calloc(3) arguments

Please GCC:

    In file included from /usr/include/php/20220829/Zend/zend.h:30,
                     from /usr/include/php/20220829/main/php.h:31,
                     from /usr/include/php/20220829/main/SAPI.h:20,
                     from src/php_snuffleupagus.h:37,
                     from src/sp_ifilter.c:1:
    src/sp_pcre_compat.h: In function 'sp_regexp_compile':
    src/sp_pcre_compat.h:38:36: warning: '__zend_calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args]
       38 |   sp_regexp *ret = pecalloc(sizeof(sp_regexp), 1, 1);
          |                                    ^~~~~~~~~
    /usr/include/php/20220829/Zend/zend_alloc.h:199:72: note: in definition of macro 'pecalloc'
      199 | #define pecalloc(nmemb, size, persistent) ((persistent)?__zend_calloc((nmemb), (size)):ecalloc((nmemb), (size)))
          |                                                                        ^~~~~
    src/sp_pcre_compat.h:38:36: note: earlier argument should specify number of elements, later size of each element
       38 |   sp_regexp *ret = pecalloc(sizeof(sp_regexp), 1, 1);
          |                                    ^~~~~~~~~
    /usr/include/php/20220829/Zend/zend_alloc.h:199:72: note: in definition of macro 'pecalloc'
      199 | #define pecalloc(nmemb, size, persistent) ((persistent)?__zend_calloc((nmemb), (size)):ecalloc((nmemb), (size)))
          |                                                                        ^~~~~
---
 src/sp_config_keywords.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/sp_config_keywords.c')

diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index 6733503..bf54428 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -201,7 +201,7 @@ SP_PARSE_FN(parse_wrapper_whitelist) {
 
 SP_PARSE_FN(parse_cookie) {
   zend_string *samesite = NULL;
-  sp_cookie *cookie = pecalloc(sizeof(sp_cookie), 1, 1);
+  sp_cookie *cookie = pecalloc(1, sizeof(sp_cookie), 1);
 
   sp_config_keyword config_keywords[] = {
       {parse_str, SP_TOKEN_NAME, &(cookie->name)},
@@ -302,7 +302,7 @@ SP_PARSE_FN(parse_disabled_functions) {
   int ret = SP_PARSER_ERROR;
   bool enable = false, disable = false, allow = false, drop = false;
   zend_string *var = NULL, *param = NULL;
-  sp_disabled_function *df = pecalloc(sizeof(*df), 1, 1);
+  sp_disabled_function *df = pecalloc(1, sizeof(*df), 1);
   df->pos = -1;
 
   sp_config_keyword config_keywords[] = {
@@ -507,7 +507,7 @@ SP_PARSE_FN(parse_ini_protection) {
 }
 
 SP_PARSE_FN(parse_ini_entry) {
-  sp_ini_entry *entry = pecalloc(sizeof(sp_ini_entry), 1, 1);
+  sp_ini_entry *entry = pecalloc(1, sizeof(sp_ini_entry), 1);
   bool rw = false, ro = false;
 
   sp_config_keyword config_keywords[] = {
-- 
cgit v1.3