Skip to content

Commit 1d8d1b4

Browse files
committed
reject broken/crafted NOKIARAW files
1 parent 1334647 commit 1d8d1b4

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Diff for: dcraw/dcraw.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -15738,7 +15738,10 @@ void CLASS identify()
1573815738
#endif
1573915739
switch (tiff_bps = i*8 / (width * height)) {
1574015740
case 8: load_raw = &CLASS eight_bit_load_raw; break;
15741-
case 10: load_raw = &CLASS nokia_load_raw;
15741+
case 10: load_raw = &CLASS nokia_load_raw; break;
15742+
#ifdef LIBRAW_LIBRARY_BUILD
15743+
case 0: throw LIBRAW_EXCEPTION_IO_CORRUPT; break;
15744+
#endif
1574215745
}
1574315746
raw_height = height + (top_margin = i / (width * tiff_bps/8) - height);
1574415747
mask[0][3] = 1;

Diff for: internal/dcraw_common.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -14399,7 +14399,10 @@ void CLASS identify()
1439914399
#endif
1440014400
switch (tiff_bps = i*8 / (width * height)) {
1440114401
case 8: load_raw = &CLASS eight_bit_load_raw; break;
14402-
case 10: load_raw = &CLASS nokia_load_raw;
14402+
case 10: load_raw = &CLASS nokia_load_raw; break;
14403+
#ifdef LIBRAW_LIBRARY_BUILD
14404+
case 0: throw LIBRAW_EXCEPTION_IO_CORRUPT; break;
14405+
#endif
1440314406
}
1440414407
raw_height = height + (top_margin = i / (width * tiff_bps/8) - height);
1440514408
mask[0][3] = 1;

0 commit comments

Comments
 (0)