Author: post
Date: 2010-11-22 00:18:03 +0100 (Mon, 22 Nov 2010)
New Revision: 300
Modified:
RawSpeed/NikonDecompressor.cpp
Log:
Clamp initial value for Nikon decoder to avoid buffer overflow.
Modified: RawSpeed/NikonDecompressor.cpp
===================================================================
--- RawSpeed/NikonDecompressor.cpp 2010-11-21 22:52:22 UTC (rev 299)
+++ RawSpeed/NikonDecompressor.cpp 2010-11-21 23:18:03 UTC (rev 300)
@@ -119,7 +119,7 @@
pUp2[y&1] += HuffDecodeNikon();
pLeft1 = pUp1[y&1];
pLeft2 = pUp2[y&1];
- dest[0] = curve[pLeft1] | (curve[pLeft2] << 16);
+ dest[0] = curve[MIN(_max-1, MAX(0,pLeft1))] | (curve[MIN(_max-1,
MAX(0,pLeft2))] << 16);
for (x = 1; x < cw; x++) {
bits->checkPos();
pLeft1 += HuffDecodeNikon();
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
