Skip to content

Protect against buffer overflow, null pointer dereference #25

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
rdmark wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Protect against buffer overflow, null pointer dereference #25

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
15 changes: 12 additions & 3 deletions bstrlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,16 @@ int i;
return NULL;
}

if (len > 0) bstr__memcpy (b->data, blk, (size_t) len);
b->data[len] = (unsigned char) '\0';
if (len > 0) {
bstr__memcpy (b->data, blk, (size_t) len);
}

if (b->mlen > len) {
b->data[len] = (unsigned char) '\0';
} else {
bstr__free (b);
return NULL;
}

return b;
}
Expand Down Expand Up @@ -2432,7 +2440,7 @@ int i, c, v;
* NULL is returned, otherwise a bstring with the correct result is returned.
*/
bstring bjoin (const struct bstrList * bl, const_bstring sep) {
if (sep != NULL && (sep->slen < 0 || sep->data == NULL)) return NULL;
if (sep == NULL || sep->slen < 0 || sep->data == NULL) return NULL;
return bjoinblk (bl, sep->data, sep->slen);
}

Expand Down Expand Up @@ -2543,6 +2551,7 @@ int i, p, ret;
}
buff->slen = 0;
}
bdestroy (buff);
return BSTR_OK;
} else {
ret = p = i = 0;
Expand Down