Skip to content

Fix undefined behavior leading to crash with clang #1

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
AMDmi3 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix undefined behavior leading to crash with clang #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ccfc93
Fix undefined behavior
AMDmi3 Nov 1, 2014
02fef1b
Fix another UB case
AMDmi3 Nov 1, 2014
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
16 changes: 12 additions & 4 deletions src/fileutil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,12 @@ char *find_file(char *name, const char *path)
char *q;
char path_buf[PATH_BUF_SIZE];
char dir_sep[2]={DIR_SEP,0};
for (p=path;p;p=q+1) {
for (p=path;p;) {
q=strchr(p,LIST_SEP);

if (q) {
if (!prepare_path_buf(path_buf,p,q)) continue;
} else {
q--;
if (!prepare_path_buf(path_buf,p,p+strlen(p))) continue;
}
strcat(path_buf,dir_sep); /* always one char */
Expand All @@ -88,6 +87,11 @@ char *find_file(char *name, const char *path)
free(name);
return strdup(path_buf);
}
if (q) {
p = q + 1;
} else {
p = NULL;
}
}
/* if we are here, nothing found */
free(name);
Expand Down Expand Up @@ -186,7 +190,7 @@ void list_charsets(void) {
int count,glob_flags=GLOB_ERR;
#endif
char **ptr;
for (p=charset_path;p;p=q+1) {
for (p=charset_path;p;) {
q=strchr(p,LIST_SEP);

if (q) {
Expand All @@ -197,7 +201,6 @@ void list_charsets(void) {
strncpy(path_buf,p,q-p);
path_buf[q-p]=0;
} else {
q--;
if (strlen(p)>=PATH_BUF_SIZE) continue;
strcpy(path_buf,p);
}
Expand Down Expand Up @@ -244,6 +247,11 @@ void list_charsets(void) {
}
glob_flags|=GLOB_APPEND;
#endif
if (q) {
p = q + 1;
} else {
p = NULL;
}
}
#ifdef __MSDOS__
fputs("utf-8\n",stdout);
Expand Down