From 206ffa3fb3fd72c6a2eb45194fb176535a91288c Mon Sep 17 00:00:00 2001
From: xXx-caillou-xXx
Date: Thu, 30 Aug 2018 17:14:08 +0200
Subject: Minor code cleanup

---
 src/sp_upload_validation.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'src/sp_upload_validation.c')

diff --git a/src/sp_upload_validation.c b/src/sp_upload_validation.c
index c079e41..6fa721e 100644
--- a/src/sp_upload_validation.c
+++ b/src/sp_upload_validation.c
@@ -21,22 +21,23 @@ int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra) {
 
   if (event == MULTIPART_EVENT_END) {
     zend_string *file_key __attribute__((unused)) = NULL;
+    const sp_config_upload_validation* config_upload =
+        SNUFFLEUPAGUS_G(config).config_upload_validation;
     zval *file;
     pid_t pid;
 
-    sp_log_debug(
-        "Got %d files",
+    sp_log_debug("Got %d files",
         zend_hash_num_elements(Z_ARRVAL(PG(http_globals)[TRACK_VARS_FILES])));
 
     ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL(PG(http_globals)[TRACK_VARS_FILES]),
                                   file_key, file) {  // for each uploaded file
 
       char *filename =
-          Z_STRVAL_P(zend_hash_str_find(Z_ARRVAL_P(file), "name", 4));
+          Z_STRVAL_P(zend_hash_str_find(Z_ARRVAL_P(file), "name", sizeof("name") - 1));
       char *tmp_name =
-          Z_STRVAL_P(zend_hash_str_find(Z_ARRVAL_P(file), "tmp_name", 8));
+          Z_STRVAL_P(zend_hash_str_find(Z_ARRVAL_P(file), "tmp_name", sizeof("tmp_name") - 1));
       size_t filesize =
-          Z_LVAL_P(zend_hash_str_find(Z_ARRVAL_P(file), "size", 4));
+          Z_LVAL_P(zend_hash_str_find(Z_ARRVAL_P(file), "size", sizeof("size") - 1));
       char *cmd[3] = {0};
       char *env[5] = {0};
 
@@ -44,10 +45,9 @@ int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra) {
           "Filename: %s\nTmpname: %s\nSize: %d\nError: %d\nScript: %s",
           filename, tmp_name, filesize,
           Z_LVAL_P(zend_hash_str_find(Z_ARRVAL_P(file), "error", 5)),
-          ZSTR_VAL(SNUFFLEUPAGUS_G(config).config_upload_validation->script));
+          ZSTR_VAL(config_upload->script));
 
-      cmd[0] =
-          ZSTR_VAL(SNUFFLEUPAGUS_G(config).config_upload_validation->script);
+      cmd[0] = ZSTR_VAL(config_upload->script);
       cmd[1] = tmp_name;
       cmd[2] = NULL;
 
@@ -59,14 +59,10 @@ int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra) {
       env[4] = NULL;
 
       if ((pid = fork()) == 0) {
-        if (execve(
-                ZSTR_VAL(
-                    SNUFFLEUPAGUS_G(config).config_upload_validation->script),
-                cmd, env) == -1) {
+        if (execve(ZSTR_VAL(config_upload->script), cmd, env) == -1) {
           sp_log_warn(
               "upload_validation", "Could not call '%s' : %s",
-              ZSTR_VAL(
-                  SNUFFLEUPAGUS_G(config).config_upload_validation->script),
+              ZSTR_VAL(config_upload->script),
               strerror(errno));
           EFREE_3(env);
           exit(1);
@@ -85,11 +81,11 @@ int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra) {
       wait(&waitstatus);
       if (WEXITSTATUS(waitstatus) != 0) {  // Nope
         char *uri = getenv("REQUEST_URI");
-        int sim = SNUFFLEUPAGUS_G(config).config_upload_validation->simulation;
+        int sim = config_upload->simulation;
         sp_log_msg("upload_validation", sim ? SP_LOG_SIMULATION : SP_LOG_DROP,
                    "The upload of %s on %s was rejected.", filename,
                    uri ? uri : "?");
-        if (!SNUFFLEUPAGUS_G(config).config_upload_validation->simulation) {
+        if (!config_upload->simulation) {
           sp_terminate();
         }
       }
-- 
cgit v1.3