Skip to content

Fix file content malloc to avoid reading beyond buffer #2440

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 1 commit into from
Jul 24, 2017
Merged

Fix file content malloc to avoid reading beyond buffer #2440

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
12 changes: 8 additions & 4 deletions src/file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,11 @@ namespace Sass {
DWORD dwFileLength = GetFileSize(hFile, NULL);
if (dwFileLength == INVALID_FILE_SIZE) return 0;
// allocate an extra byte for the null char
pBuffer = (BYTE*)malloc((dwFileLength+1)*sizeof(BYTE));
// and another one for edge-cases in lexer
pBuffer = (BYTE*)malloc((dwFileLength+2)*sizeof(BYTE));
ReadFile(hFile, pBuffer, dwFileLength, &dwBytes, NULL);
pBuffer[dwFileLength] = '\0';
pBuffer[dwFileLength+0] = '\0';
pBuffer[dwFileLength+1] = '\0';
CloseHandle(hFile);
// just convert from unsigned char*
char* contents = (char*) pBuffer;
Expand All @@ -408,10 +410,12 @@ namespace Sass {
if (file.is_open()) {
size_t size = file.tellg();
// allocate an extra byte for the null char
contents = (char*) malloc((size+1)*sizeof(char));
// and another one for edge-cases in lexer
contents = (char*) malloc((size+2)*sizeof(char));
file.seekg(0, std::ios::beg);
file.read(contents, size);
contents[size] = '\0';
contents[size+0] = '\0';
contents[size+0] = '\0';
file.close();
}
#endif
Expand Down