mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-31 18:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

path: nasm_catfile -- Fix incorrect return of filename only

Browse Source 
nasm_catfile returns an incorrect (already incremented) pointer.

https://bugzilla.nasm.us/show_bug.cgi?id=3392205

Signed-off-by: night199uk <night199uk@hermitcrabslab.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
night199uk 2018-10-18 23:18:45 +02:00 committed by Cyrill Gorcunov
parent 28b69e2a63
commit e1bd3bc7b4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nasmlib/path.c
View File

@ -164,7 +164,7 @@ char *nasm_catfile(const char *dir, const char *file)
#else
size_t dl = strlen(dir);
size_t fl = strlen(file);
char *p;
char *p, *pp;
bool dosep = true;
if (!dl || ismatch(separators, dir[dl-1])) {
@ -172,14 +172,14 @@ char *nasm_catfile(const char *dir, const char *file)
dosep = false;
}
p = nasm_malloc(dl + fl + dosep + 1);
p = pp = nasm_malloc(dl + fl + dosep + 1);
memcpy(p, dir, dl);
p += dl;
memcpy(pp, dir, dl);
pp += dl;
if (dosep)
*p++ = catsep;
*pp++ = catsep;
memcpy(p, file, fl+1);
memcpy(pp, file, fl+1);
return p;
#endif