From de1c028d12cff45b31cb9de44f434cb9a6dec4a9 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Tue, 23 Sep 2014 05:53:01 -0700 Subject: [PATCH] Declares msre_var *rvar at the beggining of the function Necessary to fix the build on Win8 VS 2011 --- apache2/re_operators.c | 3 ++- apache2/re_variables.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apache2/re_operators.c b/apache2/re_operators.c index ad4d2b30..196c9a03 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -3808,6 +3808,7 @@ static int msre_op_fuzzy_hash_execute(modsec_rec *msr, msre_rule *rule, #ifdef WITH_SSDEEP char result[FUZZY_MAX_RESULT]; struct fuzzy_hash_param_data *param = rule->op_param_data; + FILE *fp; char line[1024]; #endif @@ -3827,7 +3828,7 @@ static int msre_op_fuzzy_hash_execute(modsec_rec *msr, msre_rule *rule, return -1; } - FILE *fp = fopen(param->file, "r"); + fp = fopen(param->file, "r"); if (!fp) { *error_msg = apr_psprintf(rule->ruleset->mp, "Not able to open " \ diff --git a/apache2/re_variables.c b/apache2/re_variables.c index 2d615e99..b83af1c6 100644 --- a/apache2/re_variables.c +++ b/apache2/re_variables.c @@ -1165,6 +1165,7 @@ static int var_files_tmp_contents_generate(modsec_rec *msr, msre_var *var, size_t nread; char *full_content = NULL; size_t total_lenght = 0; + msre_var *rvar = NULL; file = fopen(parts[i]->tmp_file_name, "r"); if (file == NULL) @@ -1187,7 +1188,7 @@ static int var_files_tmp_contents_generate(modsec_rec *msr, msre_var *var, } fclose(file); - msre_var *rvar = apr_pmemdup(mptmp, var, sizeof(msre_var)); + rvar = apr_pmemdup(mptmp, var, sizeof(msre_var)); rvar->value = full_content; rvar->value_len = total_lenght; rvar->name = apr_psprintf(mptmp, "FILES_TMP_CONTENT:%s",