From 3df9dda733101446bdf8a846d45fa050396cfb68 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 29 Jun 2002 22:25:57 +0000 Subject: [PATCH] Fixed buffer overflow in CD-ROM detection code. --- platform/macclassic.c | 2 +- platform/unix.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/macclassic.c b/platform/macclassic.c index 28252d41..e6644de6 100644 --- a/platform/macclassic.c +++ b/platform/macclassic.c @@ -119,7 +119,7 @@ char **__PHYSFS_platformDetectAvailableCDs(void) hpbr.volumeParam.ioVolIndex = 0; if (PBHGetVInfoSync(&hpbr) == noErr) { - char **tmp = realloc(retval, sizeof (char *) * cd_count + 1); + char **tmp = realloc(retval, sizeof (char *) * (cd_count + 1)); if (tmp) { char *str = (char *) malloc(volName[0] + 1); diff --git a/platform/unix.c b/platform/unix.c index cd6bf0b9..80f48eda 100644 --- a/platform/unix.c +++ b/platform/unix.c @@ -91,15 +91,15 @@ char **__PHYSFS_platformDetectAvailableCDs(void) if (add_it) { - char **tmp = realloc(retval, sizeof (char *) * cd_count + 1); + char **tmp = realloc(retval, sizeof (char *) * (cd_count + 1)); if (tmp) { retval = tmp; - retval[cd_count-1] = (char *) - malloc(strlen(mntbufp[ ii ].f_mntonname) + 1); - if (retval[cd_count-1]) + retval[cd_count - 1] = (char *) + malloc(strlen(mntbufp[ii].f_mntonname) + 1); + if (retval[cd_count - 1]) { - strcpy(retval[cd_count-1], mntbufp[ ii ].f_mntonname); + strcpy(retval[cd_count - 1], mntbufp[ii].f_mntonname); cd_count++; } /* if */ } /* if */ @@ -137,14 +137,14 @@ char **__PHYSFS_platformDetectAvailableCDs(void) if (add_it) { - char **tmp = realloc(retval, sizeof (char *) * cd_count + 1); + char **tmp = realloc(retval, sizeof (char *) * (cd_count + 1)); if (tmp) { retval = tmp; retval[cd_count-1] = (char *) malloc(strlen(ent->mnt_dir) + 1); - if (retval[cd_count-1]) + if (retval[cd_count - 1]) { - strcpy(retval[cd_count-1], ent->mnt_dir); + strcpy(retval[cd_count - 1], ent->mnt_dir); cd_count++; } /* if */ } /* if */