mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
82 lines
2.3 KiB
Diff
82 lines
2.3 KiB
Diff
--- a/IlmImf/ImfDwaCompressor.cpp
|
|
+++ b/IlmImf/ImfDwaCompressor.cpp
|
|
@@ -2377,7 +2377,12 @@ DwaCompressor::uncompress
|
|
|
|
const char *dataPtr = inPtr + NUM_SIZES_SINGLE * sizeof(Int64);
|
|
|
|
- if (inSize < headerSize + compressedSize)
|
|
+ /* Both the sum and individual sizes are checked in case of overflow. */
|
|
+ if (inSize < (headerSize + compressedSize) ||
|
|
+ inSize < unknownCompressedSize ||
|
|
+ inSize < acCompressedSize ||
|
|
+ inSize < dcCompressedSize ||
|
|
+ inSize < rleCompressedSize)
|
|
{
|
|
throw Iex::InputExc("Error uncompressing DWA data"
|
|
"(truncated file).");
|
|
diff --git a/IlmImf/ImfHuf.cpp b/IlmImf/ImfHuf.cpp
|
|
index a375d05..97909a5 100644
|
|
--- a/IlmImf/ImfHuf.cpp
|
|
+++ b/IlmImf/ImfHuf.cpp
|
|
@@ -822,7 +822,7 @@ hufEncode // return: output size (in bits)
|
|
}
|
|
|
|
|
|
-#define getCode(po, rlc, c, lc, in, out, oe) \
|
|
+#define getCode(po, rlc, c, lc, in, out, ob, oe)\
|
|
{ \
|
|
if (po == rlc) \
|
|
{ \
|
|
@@ -835,6 +835,8 @@ hufEncode // return: output size (in bits)
|
|
\
|
|
if (out + cs > oe) \
|
|
tooMuchData(); \
|
|
+ else if (out - 1 < ob) \
|
|
+ notEnoughData(); \
|
|
\
|
|
unsigned short s = out[-1]; \
|
|
\
|
|
@@ -895,7 +897,7 @@ hufDecode
|
|
//
|
|
|
|
lc -= pl.len;
|
|
- getCode (pl.lit, rlc, c, lc, in, out, oe);
|
|
+ getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
|
|
}
|
|
else
|
|
{
|
|
@@ -925,7 +927,7 @@ hufDecode
|
|
//
|
|
|
|
lc -= l;
|
|
- getCode (pl.p[j], rlc, c, lc, in, out, oe);
|
|
+ getCode (pl.p[j], rlc, c, lc, in, out, outb, oe);
|
|
break;
|
|
}
|
|
}
|
|
@@ -952,7 +954,7 @@ hufDecode
|
|
if (pl.len)
|
|
{
|
|
lc -= pl.len;
|
|
- getCode (pl.lit, rlc, c, lc, in, out, oe);
|
|
+ getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
|
|
}
|
|
else
|
|
{
|
|
diff --git a/IlmImf/ImfPizCompressor.cpp b/IlmImf/ImfPizCompressor.cpp
|
|
index 46c6fba..8b3ee38 100644
|
|
--- a/IlmImf/ImfPizCompressor.cpp
|
|
+++ b/IlmImf/ImfPizCompressor.cpp
|
|
@@ -573,6 +573,12 @@ PizCompressor::uncompress (const char *inPtr,
|
|
int length;
|
|
Xdr::read <CharPtrIO> (inPtr, length);
|
|
|
|
+ if (length > inSize)
|
|
+ {
|
|
+ throw InputExc ("Error in header for PIZ-compressed data "
|
|
+ "(invalid array length).");
|
|
+ }
|
|
+
|
|
hufUncompress (inPtr, length, _tmpBuffer, tmpBufferEnd - _tmpBuffer);
|
|
|
|
//
|