lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-09-19 10:08:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed wrong pointer passed to unlock method.

Browse Source
This commit is contained in:
soukoku
2015-01-03 12:58:37 -05:00
parent 844f84e259
commit d7a2bebe2a
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
NTwain/Internals/TransferLogic.cs
View File

@@ -156,7 +156,8 @@ namespace NTwain.Internals
// data here is allocated by source so needs to use shared mem calls
if (lockedPtr != IntPtr.Zero)
{
PlatformInfo.Current.MemoryManager.Unlock(lockedPtr);
//PlatformInfo.Current.MemoryManager.Unlock(lockedPtr);
PlatformInfo.Current.MemoryManager.Unlock(dataPtr);
lockedPtr = IntPtr.Zero;
}
if (dataPtr != IntPtr.Zero)
@@ -222,7 +223,8 @@ namespace NTwain.Internals
// data here is allocated by source so needs to use shared mem calls
if (lockedPtr != IntPtr.Zero)
{
PlatformInfo.Current.MemoryManager.Unlock(lockedPtr);
//PlatformInfo.Current.MemoryManager.Unlock(lockedPtr);
PlatformInfo.Current.MemoryManager.Unlock(dataPtr);
lockedPtr = IntPtr.Zero;
}
if (dataPtr != IntPtr.Zero)
@@ -300,7 +302,8 @@ namespace NTwain.Internals
{
if (lockPtr != IntPtr.Zero)
{
PlatformInfo.Current.MemoryManager.Unlock(lockPtr);
PlatformInfo.Current.MemoryManager.Unlock(xferInfo.Memory.TheMem);
//PlatformInfo.Current.MemoryManager.Unlock(lockPtr);
}
}
}
@@ -376,7 +379,8 @@ namespace NTwain.Internals
{
if (lockPtr != IntPtr.Zero)
{
PlatformInfo.Current.MemoryManager.Unlock(lockPtr);
PlatformInfo.Current.MemoryManager.Unlock(xferInfo.Memory.TheMem);
//PlatformInfo.Current.MemoryManager.Unlock(lockPtr);
}
}
outStream.Write(buffer, 0, buffer.Length);