Skip to content

fix null dereference in CReunionConfig::open #20

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

fix null dereference in CReunionConfig::open #20

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
22 changes: 13 additions & 9 deletions reunion/src/reunion_cfg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,17 +343,21 @@ bool CReunionConfig::parseCfgParam()
FILE* CReunionConfig::open(const char* fname)
{
char path[MAX_PATH];
strncpy(path, gpMetaUtilFuncs->pfnGetPluginPath(PLID), sizeof path - 1);
path[sizeof path - 1] = '\0';
const char* ppath = gpMetaUtilFuncs->pfnGetPluginPath(PLID);

char* s = strrchr(path, '/');
if (s) {
size_t maxlen = sizeof path - 1 - (s + 1 - path);
strncpy(s + 1, fname, maxlen);
if (ppath) {
strncpy(path, ppath, sizeof path - 1);
path[sizeof path - 1] = '\0';

FILE *fl = fopen(path, "r");
if (fl) return fl;

char* s = strrchr(path, '/');
if (s) {
size_t maxlen = sizeof path - 1 - (s + 1 - path);
strncpy(s + 1, fname, maxlen);
path[sizeof path - 1] = '\0';

FILE *fl = fopen(path, "r");
if (fl) return fl;
}
}

char gamedir[MAX_PATH];
Expand Down
Loading