github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetics: moving declaration to the too of the block

Browse Source
This commit is contained in:
Felipe Zimmerle 2017-07-14 13:22:46 -03:00
parent 9f92321afb
commit 61bce8d9a9
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache2/msc_multipart.c
View File

@ -1327,14 +1327,14 @@ apr_status_t multipart_cleanup(modsec_rec *msr) {
} else { } else {
/* Move file to the upload dir. */ /* Move file to the upload dir. */
if (parts[i]->tmp_file_name != NULL) { if (parts[i]->tmp_file_name != NULL) {
const char *new_filename = NULL;
const char *new_basename = NULL;
if (strcmp(msr->txcfg->upload_dir, msr->txcfg->tmp_dir) == 0) { if (strcmp(msr->txcfg->upload_dir, msr->txcfg->tmp_dir) == 0) {
msr_log(msr, 4, "Not moving part to identical location"); msr_log(msr, 4, "Not moving part to identical location");
continue; continue;
} }
const char *new_filename = NULL;
const char *new_basename = NULL;
/* make sure it is closed first */ /* make sure it is closed first */
if (parts[i]->tmp_file_fd > 0) { if (parts[i]->tmp_file_fd > 0) {
close(parts[i]->tmp_file_fd); close(parts[i]->tmp_file_fd);

8
apache2/msc_reqbody.c
View File

@ -884,15 +884,15 @@ apr_status_t modsecurity_request_body_clear(modsec_rec *msr, char **error_msg) {
if (msr->msc_reqbody_filename != NULL) { if (msr->msc_reqbody_filename != NULL) {
if (keep_body) { if (keep_body) {
/* Move request body (which is a file) to the storage area. */
const char *put_filename = NULL;
const char *put_basename = NULL;
if (strcmp(msr->txcfg->upload_dir, msr->txcfg->tmp_dir) == 0) { if (strcmp(msr->txcfg->upload_dir, msr->txcfg->tmp_dir) == 0) {
msr_log(msr, 4, "Not moving file to identical location."); msr_log(msr, 4, "Not moving file to identical location.");
goto nullify; goto nullify;
} }
/* Move request body (which is a file) to the storage area. */
const char *put_filename = NULL;
const char *put_basename = NULL;
/* Construct the new filename. */ /* Construct the new filename. */
put_basename = file_basename(msr->msc_reqbody_mp, msr->msc_reqbody_filename); put_basename = file_basename(msr->msc_reqbody_mp, msr->msc_reqbody_filename);
if (put_basename == NULL) { if (put_basename == NULL) {