diff options
| author | notaz | 2013-03-10 17:06:09 +0200 |
|---|---|---|
| committer | notaz | 2013-03-15 02:19:08 +0200 |
| commit | 507d7c1d3eb09cbe2b7706f3fe8b88c99df54823 (patch) | |
| tree | 403dd3cb21594bf084dd47c1687f8f10e5ec8229 /libpcsxcore | |
| parent | 7010034e5499a82f96f9fb45e7be31789a3f63b9 (diff) | |
| download | pcsx_rearmed-507d7c1d3eb09cbe2b7706f3fe8b88c99df54823.tar.gz pcsx_rearmed-507d7c1d3eb09cbe2b7706f3fe8b88c99df54823.tar.bz2 pcsx_rearmed-507d7c1d3eb09cbe2b7706f3fe8b88c99df54823.zip | |
psxbios: merge from pcsxr
ckain's overflow fix (patch 13685)
Diffstat (limited to 'libpcsxcore')
| -rw-r--r-- | libpcsxcore/psxbios.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c index b3435ad..12c17ef 100644 --- a/libpcsxcore/psxbios.c +++ b/libpcsxcore/psxbios.c @@ -1837,7 +1837,8 @@ int nfile; if ((*ptr & 0xF0) != 0x50) continue; \ ptr+= 0xa; \ if (pfile[0] == 0) { \ - strcpy(dir->name, ptr); \ + strncpy(dir->name, ptr, sizeof(dir->name)); \ + dir->name[sizeof(dir->name) - 1] = '\0'; \ } else for (i=0; i<20; i++) { \ if (pfile[i] == ptr[i]) { \ dir->name[i] = ptr[i]; \ |