Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug, silence GCC 4.5.x warnings.

Browse source 
svn path=/trunk/; revision=44197
This commit is contained in:
Dmitry Gorbachev 2009-11-16 01:57:24 +00:00
parent aa317c6f63
commit e31f753c70
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/ntoskrnl/fsrtl/fastio.c
View file

@ -89,7 +89,7 @@ FsRtlCopyRead(IN PFILE_OBJECT FileObject,
return TRUE;
}
if (MAXLONGLONG < (LONGLONG) FileOffset->QuadPart + Length)
if (Length > MAXLONGLONG - FileOffset->QuadPart)
{
IoStatus->Status = STATUS_INVALID_PARAMETER;
IoStatus->Information = 0;
@ -293,6 +293,11 @@ FsRtlCopyWrite(IN PFILE_OBJECT FileObject,
ASSERT(FileObject);
ASSERT(FileObject->FsContext);
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 405)
/* Silence incorrect GCC 4.5.x warning */
OldFileSize.LowPart = 0;
#endif
/* Initialize some of the vars and pointers */
NewSize.QuadPart = 0;
Offset.QuadPart = FileOffset->QuadPart + Length;
@ -540,6 +545,11 @@ FsRtlCopyWrite(IN PFILE_OBJECT FileObject,
{
LARGE_INTEGER OldFileSize;
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 405)
/* Silence incorrect GCC 4.5.x warning */
OldFileSize.QuadPart = 0;
#endif
/* Sanity check */
ASSERT(!KeIsExecutingDpc());
@ -586,7 +596,7 @@ FsRtlCopyWrite(IN PFILE_OBJECT FileObject,
if ((FileObject->PrivateCacheMap != NULL) &&
(FcbHeader->IsFastIoPossible != FastIoIsNotPossible) &&
(FcbHeader->ValidDataLength.QuadPart + 0x2000 > Offset.QuadPart) &&
(MAXLONGLONG > Offset.QuadPart + Length) &&
(Length <= MAXLONGLONG - Offset.QuadPart) &&
(FcbHeader->AllocationSize.QuadPart >= NewSize.QuadPart))
{
/* Check if we can keep the lock shared */
@ -1349,7 +1359,7 @@ FsRtlPrepareMdlWriteDev(IN PFILE_OBJECT FileObject,
if ((FileObject->PrivateCacheMap) &&
(FcbHeader->IsFastIoPossible) &&
(MAXLONGLONG >= (LONGLONG) FileOffset->QuadPart + Length) &&
(Length <= MAXLONGLONG - FileOffset->QuadPart) &&
(NewSize.QuadPart <= FcbHeader->AllocationSize.QuadPart))
{
/* Check if we can keep the lock shared */