Skip to content

Simplified _libssh2_check_length #350

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

Merged
merged 2 commits into from
Apr 5, 2019
Merged

Simplified _libssh2_check_length #350

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5929e26
Simplified _libssh2_check_length
willco007 Apr 3, 2019
b4289ee
Updated _libssh2_check_length()
willco007 Apr 4, 2019
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
7 changes: 3 additions & 4 deletions src/misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,10 +811,9 @@ int _libssh2_get_bignum_bytes(struct string_buf *buf, unsigned char **outbuf)

int _libssh2_check_length(struct string_buf *buf, size_t len)
{
if(len > buf->len)
return 0;

return ((int)(buf->dataptr - buf->data) <= (int)(buf->len - len)) ? 1 : 0;
unsigned char *endp = &buf->data[buf->len];
size_t left = endp - buf->dataptr;
return ((len <= left) && (left <= buf->len));
}

/* Wrappers */
Expand Down