From 64f4cd53d5f6d8a61a89b5a6b13174c3dbb45dbd Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Sun, 31 May 2009 00:01:03 +0000 Subject: fixed invalid memory access git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@23606 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- ChangeLog | 4 ++++ gui/Config.c | 4 +++- plugins/dfxvideo/cfg.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a87c5005..20beaf99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +May 31, 2009 Wei Mingzhi + + * gui/Config.c, plugins/dfxvideo/cfg.c: Fixed invalid memory access. + May 30, 2009 Wei Mingzhi * plugins/peopsxgl/draw.c: Modified for compatiability with x86_64. diff --git a/gui/Config.c b/gui/Config.c index dc8489b1..18c897d7 100644 --- a/gui/Config.c +++ b/gui/Config.c @@ -90,12 +90,14 @@ int LoadConfig(PcsxConfig *Conf) { f = fopen(cfgfile, "r"); if (f == NULL) return -1; - data = (char*)malloc(size); + data = (char*)malloc(size + 1); if (data == NULL) return -1; fread(data, 1, buf.st_size, f); fclose(f); + data[size] = '\0'; + GetValue(data, "Bios", Config.Bios); GetValue(data, "Gpu", Config.Gpu); GetValue(data, "Spu", Config.Spu); diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c index c341ef05..f98e1256 100644 --- a/plugins/dfxvideo/cfg.c +++ b/plugins/dfxvideo/cfg.c @@ -108,8 +108,8 @@ void ReadConfigFile() in = fopen(t,"rb"); if (!in) return; - pB=(char *)malloc(size); - memset(pB,0,size); + pB=(char *)malloc(size + 1); + memset(pB,0,size + 1); len = fread(pB, 1, size, in); fclose(in); -- cgit v1.2.3