Skip to content

genesis: fix calling strtoul on non-null terminated string #8422

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

Open
two-heart wants to merge 1 commit into
base: main
Choose a base branch
from
Open

genesis: fix calling strtoul on non-null terminated string #8422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 21 additions & 3 deletions src/discof/genesis/fd_genesis_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,16 +160,34 @@ write_conn( fd_genesis_client_t * client,
}
}

static ulong
rpc_parse_decimal_ulong( char const * s,
ulong s_len,
ulong * out ) {
if( FD_UNLIKELY( !s_len ) ) return 0UL;

ulong val = 0UL;
for( ulong i=0UL; i<s_len; i++ ) {
char c = s[ i ];
if( FD_UNLIKELY( (c<'0') | (c>'9') ) ) return 0UL;
ulong digit = (ulong)(c-'0');
if( FD_UNLIKELY( val>(ULONG_MAX-digit)/10UL ) ) return 0UL;
val = val*10UL + digit;
}

*out = val;
return 1UL;
}

static ulong
rpc_phr_content_length( struct phr_header * headers,
ulong num_headers ) {
for( ulong i=0UL; i<num_headers; i++ ) {
if( FD_LIKELY( headers[i].name_len!=14UL ) ) continue;
if( FD_LIKELY( strncasecmp( headers[i].name, "Content-Length", 14UL ) ) ) continue;
char * end;
ulong content_length = strtoul( headers[i].value, &end, 10 );
ulong content_length = 0UL;
if( FD_UNLIKELY( !rpc_parse_decimal_ulong( headers[i].value, (ulong)headers[i].value_len, &content_length ) ) ) return ULONG_MAX;
if( FD_UNLIKELY( content_length>UINT_MAX ) ) return ULONG_MAX; /* prevent overflow */
if( FD_UNLIKELY( end==headers[i].value ) ) return ULONG_MAX;
return content_length;
}
return ULONG_MAX;
Expand Down
Loading