Fixed buffer overflow in CD-ROM detection code.

icculus · Jun 29, 2002 · 3df9dda · 3df9dda
1 parent 4dce6ee
commit 3df9dda
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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 */