Author: post
Date: 2013-09-30 16:51:32 +0200 (Mon, 30 Sep 2013)
New Revision: 598
Modified:
RawSpeed/TiffIFD.cpp
RawSpeed/TiffParserHeaderless.cpp
Log:
Relax a few more size checks (though most not practically reachable)
Modified: RawSpeed/TiffIFD.cpp
===================================================================
--- RawSpeed/TiffIFD.cpp 2013-09-30 14:45:34 UTC (rev 597)
+++ RawSpeed/TiffIFD.cpp 2013-09-30 14:51:32 UTC (rev 598)
@@ -29,7 +29,7 @@
#undef CHECKSIZE
#endif
-#define CHECKSIZE(A) if (A >= size) ThrowTPE("Error reading TIFF structure
(invalid size). File Corrupt")
+#define CHECKSIZE(A) if (A > size) ThrowTPE("Error reading TIFF structure
(invalid size). File Corrupt")
TiffIFD::TiffIFD() {
nextIFD = 0;
Modified: RawSpeed/TiffParserHeaderless.cpp
===================================================================
--- RawSpeed/TiffParserHeaderless.cpp 2013-09-30 14:45:34 UTC (rev 597)
+++ RawSpeed/TiffParserHeaderless.cpp 2013-09-30 14:51:32 UTC (rev 598)
@@ -39,7 +39,7 @@
#undef CHECKPTR
#endif
-#define CHECKSIZE(A) if (A >= mInput->getSize()) throw
TiffParserException("Error reading Headerless TIFF structure. File Corrupt")
+#define CHECKSIZE(A) if (A > mInput->getSize()) throw
TiffParserException("Error reading Headerless TIFF structure. File Corrupt")
#define CHECKPTR(A) if ((int)A >= ((int)(mInput->data) + size))) throw
TiffParserException("Error reading Headerless TIFF structure. File Corrupt")
void TiffParserHeaderless::parseData() {
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
