QingdaoU/Judger
1
0
Fork 0
mirror of https://github.com/QingdaoU/Judger.git synced 2025-01-16 09:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复coverity扫描发现的问题

Browse Source
This commit is contained in:
LiYang 2016-09-30 23:08:38 +08:00
parent b4c1fc1885
commit 5a89bc363f
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/child.c
View File

@ -37,6 +37,7 @@ void close_file(FILE *fp, ...) {
int child_process(void *args) { int child_process(void *args) {
FILE *log_fp = ((child_args *) args)->log_fp; FILE *log_fp = ((child_args *) args)->log_fp;
FILE *input_file = NULL, *output_file = NULL, *error_file = NULL;
struct config *_config = ((child_args *) args)->_config; struct config *_config = ((child_args *) args)->_config;
// set memory limit // set memory limit
@ -75,7 +76,6 @@ int child_process(void *args) {
} }
} }
FILE *input_file = NULL, *output_file = NULL, *error_file = NULL;
if (_config->input_path != NULL) { if (_config->input_path != NULL) {
input_file = fopen(_config->input_path, "r"); input_file = fopen(_config->input_path, "r");
if (input_file == NULL) { if (input_file == NULL) {
@ -86,7 +86,6 @@ int child_process(void *args) {
// On error, -1 is returned, and errno is set appropriately. // On error, -1 is returned, and errno is set appropriately.
if (dup2(fileno(input_file), fileno(stdin)) == -1) { if (dup2(fileno(input_file), fileno(stdin)) == -1) {
// todo log // todo log
close_file(input_file);
CHILD_ERROR_EXIT(DUP2_FAILED); CHILD_ERROR_EXIT(DUP2_FAILED);
} }
} }
@ -94,33 +93,29 @@ int child_process(void *args) {
if (_config->output_path != NULL) { if (_config->output_path != NULL) {
output_file = fopen(_config->output_path, "w"); output_file = fopen(_config->output_path, "w");
if (output_file == NULL) { if (output_file == NULL) {
close_file(input_file);
CHILD_ERROR_EXIT(DUP2_FAILED); CHILD_ERROR_EXIT(DUP2_FAILED);
} }
// redirect stdout -> file // redirect stdout -> file
if (dup2(fileno(output_file), fileno(stdout)) == -1) { if (dup2(fileno(output_file), fileno(stdout)) == -1) {
close_file(input_file, output_file);
CHILD_ERROR_EXIT(DUP2_FAILED); CHILD_ERROR_EXIT(DUP2_FAILED);
} }
} }
if (_config->error_path != NULL) { if (_config->error_path != NULL) {
// if outfile and error_file is the same path, we use the same file pointer // if outfile and error_file is the same path, we use the same file pointer
if (strcmp(_config->output_path, _config->error_path) == 0) { if (_config->output_path != NULL && strcmp(_config->output_path, _config->error_path) == 0) {
error_file = output_file; error_file = output_file;
} }
else { else {
error_file = fopen(_config->error_path, "w"); error_file = fopen(_config->error_path, "w");
if (error_file == NULL) { if (error_file == NULL) {
// todo log // todo log
close_file(input_file, output_file);
CHILD_ERROR_EXIT(DUP2_FAILED); CHILD_ERROR_EXIT(DUP2_FAILED);
} }
} }
// redirect stderr -> file // redirect stderr -> file
if (dup2(fileno(error_file), fileno(stderr)) == -1) { if (dup2(fileno(error_file), fileno(stderr)) == -1) {
// todo log // todo log
close_file(input_file, output_file, error_file);
CHILD_ERROR_EXIT(DUP2_FAILED); CHILD_ERROR_EXIT(DUP2_FAILED);
} }
} }

1
src/child.h
View File

@ -6,6 +6,7 @@
#define CHILD_ERROR_EXIT(error_code)\ #define CHILD_ERROR_EXIT(error_code)\
{\ {\
LOG_ERROR(error_code); \ LOG_ERROR(error_code); \
close_file(input_file, output_file, error_file); \
raise(SIGUSR1); \ raise(SIGUSR1); \
return -1; \ return -1; \
} }

2
src/runner.h
View File

@ -5,7 +5,7 @@
#include <stdio.h> #include <stdio.h>
// (ver >> 16) & 0xff, (ver >> 8) & 0xff, ver & 0xff -> real version // (ver >> 16) & 0xff, (ver >> 8) & 0xff, ver & 0xff -> real version
#define VERSION 0x020000 #define VERSION 0x020001
#define UNLIMITED -1 #define UNLIMITED -1