MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 21:55:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

buffer overflow handling in fsnotifier (IDEA-67787)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-08-04 19:12:57 +02:00
parent c7482a6e1b
commit f662b1da83
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/win/fsnotifier.exe
BIN
View File
Binary file not shown.
native/fileWatcher/fileWatcher3.cpp
+32 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -310,6 +310,15 @@ void PrintChangeInfo(char *rootPath, FILE_NOTIFY_INFORMATION *info)
LeaveCriticalSection(&csOutput);
}
void PrintEverythingChangedUnderRoot(char *rootPath)
{
EnterCriticalSection(&csOutput);
puts("RECDIRTY");
puts(rootPath);
fflush(stdout);
LeaveCriticalSection(&csOutput);
}
DWORD WINAPI WatcherThread(void *param)
{
WatchRootInfo *info = (WatchRootInfo *) param;
@@ -353,13 +362,30 @@ DWORD WINAPI WatcherThread(void *param)
}
if (rc == WAIT_OBJECT_0+1)
{
FILE_NOTIFY_INFORMATION *info = (FILE_NOTIFY_INFORMATION *) buffer;
while(true)
DWORD dwBytesReturned;
if(!GetOverlappedResult(hRootDir, &overlapped, &dwBytesReturned, FALSE))
{
PrintChangeInfo(rootPath, info);
if (!info->NextEntryOffset)
info->bFailed = true;
break;
}
if (dwBytesReturned == 0)
{
// don't send dirty too much, everything is changed anyway
if (WaitForSingleObject(info->hStopEvent, 500) == WAIT_OBJECT_0)
break;
info = (FILE_NOTIFY_INFORMATION *) ((char *) info + info->NextEntryOffset);
// Got a buffer overflow => current changes lost => send RECDIRTY on root
PrintEverythingChangedUnderRoot(rootPath);
} else {
FILE_NOTIFY_INFORMATION *info = (FILE_NOTIFY_INFORMATION *) buffer;
while(true)
{
PrintChangeInfo(rootPath, info);
if (!info->NextEntryOffset)
break;
info = (FILE_NOTIFY_INFORMATION *) ((char *) info + info->NextEntryOffset);
}
}
}
}
native/fileWatcher/targetver.h
+1 -1
View File
@@ -8,6 +8,6 @@
// Modify the following defines if you have to target a platform prior to the ones specified below.
// Refer to MSDN for the latest info on corresponding values for different platforms.
#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista.
#define _WIN32_WINNT 0x0500 // Change this to the appropriate value to target other versions of Windows.
#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
#endif