Skip to content

Commit b2b2951

Browse files
author
Felipe Zimmerle
committed
Declares msre_var *rvar at the beggining of the function
Necessary to fix the build on Win8 VS 2011
1 parent b6e061e commit b2b2951

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

apache2/re_operators.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3808,6 +3808,7 @@ static int msre_op_fuzzy_hash_execute(modsec_rec *msr, msre_rule *rule,
38083808
#ifdef WITH_SSDEEP
38093809
char result[FUZZY_MAX_RESULT];
38103810
struct fuzzy_hash_param_data *param = rule->op_param_data;
3811+
FILE *fp;
38113812
char line[1024];
38123813
#endif
38133814

@@ -3827,7 +3828,7 @@ static int msre_op_fuzzy_hash_execute(modsec_rec *msr, msre_rule *rule,
38273828
return -1;
38283829
}
38293830

3830-
FILE *fp = fopen(param->file, "r");
3831+
fp = fopen(param->file, "r");
38313832
if (!fp)
38323833
{
38333834
*error_msg = apr_psprintf(rule->ruleset->mp, "Not able to open " \

apache2/re_variables.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1165,6 +1165,7 @@ static int var_files_tmp_contents_generate(modsec_rec *msr, msre_var *var,
11651165
size_t nread;
11661166
char *full_content = NULL;
11671167
size_t total_lenght = 0;
1168+
msre_var *rvar = NULL;
11681169

11691170
file = fopen(parts[i]->tmp_file_name, "r");
11701171
if (file == NULL)
@@ -1187,7 +1188,7 @@ static int var_files_tmp_contents_generate(modsec_rec *msr, msre_var *var,
11871188
}
11881189
fclose(file);
11891190

1190-
msre_var *rvar = apr_pmemdup(mptmp, var, sizeof(msre_var));
1191+
rvar = apr_pmemdup(mptmp, var, sizeof(msre_var));
11911192
rvar->value = full_content;
11921193
rvar->value_len = total_lenght;
11931194
rvar->name = apr_psprintf(mptmp, "FILES_TMP_CONTENT:%s",

0 commit comments

Comments
 (0)