thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0976: dosinstall still has buffer overflow problems

Browse Source 
Problem:    Dosinstall still has buffer overflow problems.
Solution:   Adjust  buffer sizes. (Yasuhiro Matsumoto, closes #4002)
This commit is contained in:
Bram Moolenaar
2019-02-22 19:41:08 +01:00
parent c666388367
commit e4963c543d
4 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/uninstal.c
View File

@@ -60,11 +60,10 @@ reg_delete_key(HKEY hRootKey, const char *key, DWORD flag)
* Returns non-zero when it's found.
*/
static int
popup_gvim_path(char *buf)
popup_gvim_path(char *buf, DWORD bufsize)
{
HKEY key_handle;
DWORD value_type;
DWORD bufsize = BUFSIZE;
int r;
/* Open the key where the path to gvim.exe is stored. */
@@ -87,11 +86,10 @@ popup_gvim_path(char *buf)
* Returns non-zero when it's found.
*/
static int
openwith_gvim_path(char *buf)
openwith_gvim_path(char *buf, DWORD bufsize)
{
HKEY key_handle;
DWORD value_type;
DWORD bufsize = BUFSIZE;
int r;
/* Open the key where the path to gvim.exe is stored. */
@@ -209,7 +207,7 @@ batfile_thisversion(char *path)
fd = fopen(path, "r");
if (fd != NULL)
{
while (fgets(line, BUFSIZE, fd) != NULL)
while (fgets(line, sizeof(line), fd) != NULL)
{
for (p = line; *p != 0; ++p)
/* don't accept "vim60an" when looking for "vim60". */
@@ -335,7 +333,7 @@ main(int argc, char *argv[])
printf("This program will remove the following items:\n");
if (popup_gvim_path(popup_path))
if (popup_gvim_path(popup_path, sizeof(popup_path)))
{
printf(" - the \"Edit with Vim\" entry in the popup menu\n");
printf(" which uses \"%s\"\n", popup_path);
@@ -349,7 +347,7 @@ main(int argc, char *argv[])
remove_openwith();
}
}
else if (openwith_gvim_path(popup_path))
else if (openwith_gvim_path(popup_path, sizeof(popup_path)))
{
printf(" - the Vim \"Open With...\" entry in the popup menu\n");
printf(" which uses \"%s\"\n", popup_path);