Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix for registry path length checks when doing out-of-source code generation #2136

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Bug fix for registry path length checks when doing out-of-source code generation #2136

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5413ef
Check path length when using provided dir and improve wording of erro…
islas Nov 22, 2024
746b2a9
Ensure if checks for both paths are part of the same block
islas Dec 2, 2024
391800d
Remove lingering debug statement
islas Dec 31, 2024
a6528d5
Add explicit returns after registry errors
islas Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions tools/reg_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
static int ntracers = 0 ;
static char tracers[1000][100] ;

#define MAX_PATH 256

int
pre_parse( char * dir, FILE * infile, FILE * outfile )
{
Expand Down Expand Up @@ -117,10 +119,12 @@ pre_parse( char * dir, FILE * infile, FILE * outfile )
for ( p = inln ; ( *p == ' ' || *p == ' ' ) && *p != '\0' ; p++ ) ;
if ( !strncmp( p , "include", 7 ) && ! ( ifdef_stack_ptr >= 0 && ! ifdef_stack[ifdef_stack_ptr] ) ) {
FILE *include_fp ;
char include_file_name_local_registry[128] ;
char include_file_name[128] ;
char include_file_name_local_registry[MAX_PATH] ;
char include_file_name[MAX_PATH] ;
p += 7 ; for ( ; ( *p == ' ' || *p == ' ' ) && *p != '\0' ; p++ ) ;
if ( strlen( p ) > 127 ) { fprintf(stderr,"Registry warning: invalid include file name: %s\n", p ) ; }

if ( strlen( p ) > MAX_PATH - 1 ) { fprintf(stderr,"Registry error: include file name too long: %s\n", p ) ; return 1; }
else if ( ( strlen( p ) + strlen( dir ) ) > MAX_PATH - 1 ) { fprintf(stderr,"Registry error: include file name too long when adding path: %s/%s\n", dir, p ) ; return 1; }
else {

sprintf( include_file_name_local_registry, "./Registry/%s", p ) ;
Expand All @@ -135,12 +139,14 @@ pre_parse( char * dir, FILE * infile, FILE * outfile )
{

fprintf(stderr,"including %s\n",include_file_name ) ;
pre_parse( dir , include_fp , outfile ) ;
int inc_retval = pre_parse( dir , include_fp , outfile ) ;
if ( inc_retval ) { return inc_retval; }

fclose( include_fp ) ;
}
else {
fprintf(stderr,"Registry warning: cannot open %s. Tried %s and %s Ignoring.\n", include_file_name, include_file_name, include_file_name_local_registry ) ;
fprintf(stderr,"Registry error: cannot open %s. Tried %s and %s.\n", include_file_name, include_file_name, include_file_name_local_registry ) ;
return 1;
}
}
}
Expand Down