be more error prone

v0.27.3
Michał Walenciak 8 years ago
parent 24348e85ca
commit d219e61586

@ -76,7 +76,7 @@ namespace Exiv2
Header readHeader(BasicIo& io) Header readHeader(BasicIo& io)
{ {
byte header[2]; byte header[2] = {0, 0};
io.read(header, 2); io.read(header, 2);
ByteOrder byteOrder = invalidByteOrder; ByteOrder byteOrder = invalidByteOrder;
@ -88,10 +88,8 @@ namespace Exiv2
if (byteOrder == invalidByteOrder) if (byteOrder == invalidByteOrder)
return Header(); return Header();
byte version[2]; byte version[2] = {0, 0};
int read = io.read(version, 2); io.read(version, 2);
if (read < 2)
throw Exiv2::Error(58);
const uint16_t magic = getUShort(version, byteOrder); const uint16_t magic = getUShort(version, byteOrder);
@ -103,7 +101,7 @@ namespace Exiv2
if (magic == 0x2A) if (magic == 0x2A)
{ {
byte buffer[4]; byte buffer[4];
io.read(buffer, 4); int read = io.read(buffer, 4);
if (read < 4) if (read < 4)
throw Exiv2::Error(58); throw Exiv2::Error(58);
@ -114,7 +112,7 @@ namespace Exiv2
else else
{ {
byte buffer[8] = {0, 0, 0, 0, 0, 0, 0, 0}; byte buffer[8] = {0, 0, 0, 0, 0, 0, 0, 0};
io.read(buffer, 2); int read = io.read(buffer, 2);
if (read < 2) if (read < 2)
throw Exiv2::Error(58); throw Exiv2::Error(58);

Loading…
Cancel
Save