joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5316 from genosse-einhorn/master

Browse Source 
VHD: fix buffer overflow in calc_relative_path
This commit is contained in:
Jonathan Campbell 2024-12-15 08:52:41 -08:00 committed by GitHub
commit 38151d33be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ints/bios_vhd.cpp
View File

@ -89,15 +89,16 @@ char* calc_relative_path(const char* base, const char* child) {
x++;
}
// allocates space for the resulting string and premits any needed ".\" or "..\"
y = (char*)malloc(strlen(q) + n * 3 + 2); // n * strlen("..\\")
z = y;
if (!n) {
if (n == 0) {
z = y = (char *)malloc(strlen(p) + 2 + 1);
strcpy(z, ".\\");
z += 2;
}
while(n--) {
strcpy(z, "..\\");
z += 3;
} else {
z = y = (char*)malloc(strlen(p) + n * 3 + 1); // n * strlen("..\\")
while(n--) {
strcpy(z, "..\\");
z += 3;
}
}
// finally adds base relative pathname
strcpy(z, p);