core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GRIB-453: grib_filter hangs if rules_file have wrong path

This commit is contained in:
Shahram Najm 2013-11-06 18:22:28 +00:00
parent 7a33df06a8
commit a864baa479
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/grib_parse_utils.c
View File

@ -386,10 +386,7 @@ int grib_yywrap()
parse_file = 0; parse_file = 0;
grib_yyin = NULL; grib_yyin = NULL;
return 1; return 1;
} }
} }
int grib_yyerror(const char* msg) int grib_yyerror(const char* msg)
@ -400,7 +397,6 @@ int grib_yyerror(const char* msg)
return 1; return 1;
} }
void grib_parser_include(const char* fname) void grib_parser_include(const char* fname)
{ {
FILE *f ; FILE *f ;
@ -472,7 +468,6 @@ void grib_parser_include(const char* fname)
} }
} }
extern int grib_yyparse(void); extern int grib_yyparse(void);
static int parse(grib_context* gc,const char* filename) static int parse(grib_context* gc,const char* filename)
@ -491,12 +486,16 @@ static int parse(grib_context* gc,const char* filename)
top = 0; top = 0;
parse_file = 0; parse_file = 0;
grib_parser_include(filename); grib_parser_include(filename);
if (!grib_yyin) {
/* Could not read from file */
parse_file = 0;
return GRIB_FILE_NOT_FOUND;
}
err = grib_yyparse(); err = grib_yyparse();
parse_file = 0; parse_file = 0;
if (err) grib_context_log(gc,GRIB_LOG_ERROR,"Parsing error %d > %s\n",err, filename); if (err) grib_context_log(gc,GRIB_LOG_ERROR,"Parsing error %d > %s\n",err, filename);
return err; return err;
} }
@ -587,7 +586,7 @@ grib_action* grib_parse_file( grib_context* gc,const char* filename)
if(error) if(error)
{ {
#if 1 #if 1
grib_free_action(gc,a); if (a) grib_free_action(gc,a);
GRIB_MUTEX_UNLOCK(&mutex_file); GRIB_MUTEX_UNLOCK(&mutex_file);
return NULL; return NULL;
#endif #endif