Skip to content

Fire 304: Toffee File.WriteBytes of 0 length creates empty file; Binary.ToArray of 0 length creates empty 0-element array #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidm-ro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fire 304: Toffee File.WriteBytes of 0 length creates empty file; Binary.ToArray of 0 length creates empty 0-element array #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Source/RemObjects.Elements.RTL/Binary.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,12 @@ constructor Binary(Bin: ImmutableBinary);
{$IF COOPER}
result := fData.toByteArray as not nullable;
{$ELSEIF TOFFEE}
result := new Byte[mapped.length];
mapped.getBytes(result) length(mapped.length);
if mapped.length = 0 then
exit []
else begin
result := new Byte[mapped.length];
mapped.getBytes(result) length(mapped.length);
end;
{$ELSEIF ECHOES OR ISLAND}
result := mapped.ToArray as not nullable;
{$ENDIF}
Expand Down
5 changes: 4 additions & 1 deletion Source/RemObjects.Elements.RTL/File.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,10 @@ constructor File(aPath: not nullable String);
class method File.WriteBytes(aFileName: String; Content: array of Byte);
begin
{$IF TOFFEE}
(new Binary(Content) as NSData).writeToURL(NSURL.fileURLWithPath(aFileName)) atomically(true);
if length(Content) > 0 then
(new Binary(Content) as NSData).writeToURL(NSURL.fileURLWithPath(aFileName)) atomically(true)
else
NSData.data.writeToURL(NSURL.fileURLWithPath(aFileName)) atomically(true);
{$ELSE}
var Handle := new FileHandle(aFileName, FileOpenMode.Create);
try
Expand Down