mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-30 23:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Issue 18452 - std.zip has size limit of 2 GB

Browse source
This commit is contained in:
Andrei-Cristian VASILE (87585) 2018-03-24 20:03:52 +02:00
parent 6797b52c0d
commit 0dc7ea22b0
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
std/zip.d
View file

@ -764,7 +764,7 @@ final class ZipArchive
if (de.flags & 1) if (de.flags & 1)
throw new ZipException("encryption not supported"); throw new ZipException("encryption not supported");
int i; uint i;
i = de.offset + 30 + namelen + extralen; i = de.offset + 30 + namelen + extralen;
if (i + de.compressedSize > endrecOffset) if (i + de.compressedSize > endrecOffset)
throw new ZipException("invalid directory entry 5"); throw new ZipException("invalid directory entry 5");
@ -793,35 +793,35 @@ final class ZipArchive
/* ============ Utility =================== */ /* ============ Utility =================== */
@safe @nogc pure nothrow ushort getUshort(int i) @safe @nogc pure nothrow ushort getUshort(uint i)
{ {
ubyte[2] result = data[i .. i + 2]; ubyte[2] result = data[i .. i + 2];
return littleEndianToNative!ushort(result); return littleEndianToNative!ushort(result);
} }
@safe @nogc pure nothrow uint getUint(int i) @safe @nogc pure nothrow uint getUint(uint i)
{ {
ubyte[4] result = data[i .. i + 4]; ubyte[4] result = data[i .. i + 4];
return littleEndianToNative!uint(result); return littleEndianToNative!uint(result);
} }
@safe @nogc pure nothrow ulong getUlong(int i) @safe @nogc pure nothrow ulong getUlong(uint i)
{ {
ubyte[8] result = data[i .. i + 8]; ubyte[8] result = data[i .. i + 8];
return littleEndianToNative!ulong(result); return littleEndianToNative!ulong(result);
} }
@safe @nogc pure nothrow void putUshort(int i, ushort us) @safe @nogc pure nothrow void putUshort(uint i, ushort us)
{ {
data[i .. i + 2] = nativeToLittleEndian(us); data[i .. i + 2] = nativeToLittleEndian(us);
} }
@safe @nogc pure nothrow void putUint(int i, uint ui) @safe @nogc pure nothrow void putUint(uint i, uint ui)
{ {
data[i .. i + 4] = nativeToLittleEndian(ui); data[i .. i + 4] = nativeToLittleEndian(ui);
} }
@safe @nogc pure nothrow void putUlong(int i, ulong ul) @safe @nogc pure nothrow void putUlong(uint i, ulong ul)
{ {
data[i .. i + 8] = nativeToLittleEndian(ul); data[i .. i + 8] = nativeToLittleEndian(ul);
} }