Fix #484 [Win64]Cannot save and load image files with a heap whose size is more than 0xff ff ff ff (~4.1GB) #485
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add Writing and Reading by block of MAX_DWORD
Display an error message if it the amount of bytes that should be written or read is not consistent
j4yk
reviewed
Apr 11, 2020
| @@ -37,6 +37,7 @@ extern struct VirtualMachine *interpreterProxy; | |||
|
|
|||
| #define true 1 | |||
| #define false 0 | |||
| static const DWORD MAX_DWORD = 4294967295; | |||
There was a problem hiding this comment.
Suggested change
| static const DWORD MAX_DWORD = 4294967295; | |
| static const DWORD MAX_DWORD = MAXDWORD; |
There was a problem hiding this comment.
...so really one could just use the constant provided by the Windows headers below.
j4yk
reviewed
Apr 11, 2020
| BOOL ret = ReadFile((HANDLE)(h - 1), (LPVOID)((sqInt)ptr + (sqInt)reallyRead), toRead, &dwReallyRead, NULL); | ||
| reallyRead += dwReallyRead; | ||
|
|
||
| if (!ret | dwReallyRead != toRead) { |
There was a problem hiding this comment.
Not sure whether this is a bug or "clever" code to use the bitwise or. I suggest using the boolean operators (&& and ||) instead for clarity.
There was a problem hiding this comment.
It is not clever code here. Thanks for spotting it!
j4yk
reviewed
Apr 11, 2020
| BOOL ret = WriteFile((HANDLE)(h - 1), (LPVOID)((sqInt)ptr + (sqInt) reallyWritten), toWrite, &dwReallyWritten, NULL); | ||
| reallyWritten += dwReallyWritten; | ||
|
|
||
| if (!ret | dwReallyWritten != toWrite) { |
eliotmiranda
approved these changes
Apr 11, 2020
|
@jakob: Eliot seems to have merged this without incorporating your
feedback. Could you please open another PR with your suggestions?
Thanks,
Fabio
…On Sat, 11 Apr 2020 at 9:46 pm, Jakob Reschke ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c
<#485 (comment)>
:
> DWORD dwReallyWritten;
- WriteFile((HANDLE)(h-1), (LPVOID) ptr, count*sz, &dwReallyWritten, NULL);
- return (size_t) (dwReallyWritten / sz);
+ size_t totalToWrite = count * sz;
+ squeakFileOffsetType position;
+
+ position = sqImageFilePosition(h);
+ while (reallyWritten != totalToWrite) {
+ DWORD toWrite = (totalToWrite - reallyWritten) > (size_t) MAX_DWORD ? MAX_DWORD : totalToWrite - reallyWritten;
+ BOOL ret = WriteFile((HANDLE)(h - 1), (LPVOID)((sqInt)ptr + (sqInt) reallyWritten), toWrite, &dwReallyWritten, NULL);
+ reallyWritten += dwReallyWritten;
+
+ if (!ret | dwReallyWritten != toWrite) {
See above.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#485 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AIJPEWYSLSBS2AMBET6YZLTRMDCK3ANCNFSM4MGDV3UQ>
.
|
VincentBlondeau
added a commit
to VincentBlondeau/opensmalltalk-vm
that referenced
this pull request
Apr 12, 2020
hogoww
referenced
this pull request
in hogoww/opensmalltalk-vm
Dec 23, 2021
… false ] on method [ is:onObjStack: ]
hogoww
referenced
this pull request
in hogoww/opensmalltalk-vm
Dec 23, 2021
…false ] on method [ is:onObjStack: ] SURVIVED 8/8 test cases.
hogoww
referenced
this pull request
in hogoww/opensmalltalk-vm
Feb 26, 2022
…oat value ] on method [ scavengingGCTenuringIf: ] 14 test cases.
hogoww
referenced
this pull request
in hogoww/opensmalltalk-vm
Feb 26, 2022
…at value ] on method [ scavengingGCTenuringIf: ] 14/14 test case are EQUIVALENT
guillep
added a commit
to tesonep/opensmalltalk-vm
that referenced
this pull request
May 12, 2023
…ature/gdbinit Revert "gdbinit file and helpers"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The problem is actually when there is only one segment of memory of more of 0xff ff ff ff to read or to write to disk.
This fix the issue and it is tested with a real case on windows.
I added some checks on function return.
Let me know if changes are to be done to follows some conventions or optimizations.