summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc.cpp4
-rw-r--r--zinflate.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/misc.cpp b/misc.cpp
index 9430e44..27a9a35 100644
--- a/misc.cpp
+++ b/misc.cpp
@@ -11,7 +11,7 @@ NAMESPACE_BEGIN(CryptoPP)
void xorbuf(byte *buf, const byte *mask, unsigned int count)
{
- if (((unsigned int)buf | (unsigned int)mask | count) % WORD_SIZE == 0)
+ if (((size_t)buf | (size_t)mask | count) % WORD_SIZE == 0)
XorWords((word *)buf, (const word *)mask, count/WORD_SIZE);
else
{
@@ -22,7 +22,7 @@ void xorbuf(byte *buf, const byte *mask, unsigned int count)
void xorbuf(byte *output, const byte *input, const byte *mask, unsigned int count)
{
- if (((unsigned int)output | (unsigned int)input | (unsigned int)mask | count) % WORD_SIZE == 0)
+ if (((size_t)output | (size_t)input | (size_t)mask | count) % WORD_SIZE == 0)
XorWords((word *)output, (const word *)input, (const word *)mask, count/WORD_SIZE);
else
{
diff --git a/zinflate.cpp b/zinflate.cpp
index 339d1b1..3910c50 100644
--- a/zinflate.cpp
+++ b/zinflate.cpp
@@ -488,9 +488,9 @@ bool Inflator::DecodeBody()
switch (m_nextDecode)
{
+ case LITERAL:
while (true)
{
- case LITERAL:
if (!pLiteralDecoder->Decode(m_reader, m_literal))
{
m_nextDecode = LITERAL;