diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2014-08-22 08:43:36 +0200 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2014-08-22 08:43:36 +0200 |
| commit | c19c9dd783d241b21bd51d1b79e9a6843ab392a5 (patch) | |
| tree | 7818f3d3d7a8eadb94204c1a50108d17b76bc030 | |
| parent | bc6112ba256ee136cb9b26d5140cd5a57f694a76 (diff) | |
| parent | 8ce4f466f87ed4e05bb59a4bd47b19f3d8b8b9e1 (diff) | |
Merge pull request #5263 from FernetMenta/cximage
cximage: fix broken cr2 after wrong backport of security fix d13aee8e81b...
| -rw-r--r-- | lib/cximage-6.0/raw/libdcr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/cximage-6.0/raw/libdcr.c b/lib/cximage-6.0/raw/libdcr.c index e441afb742..7e357f2ed7 100644 --- a/lib/cximage-6.0/raw/libdcr.c +++ b/lib/cximage-6.0/raw/libdcr.c @@ -920,6 +920,8 @@ void DCR_CLASS dcr_lossless_jpeg_load_raw(DCRAW* p) } if (p->raw_width == 3984 && (col -= 2) < 0) col += (row--,p->raw_width); + if (row > p->raw_height) + longjmp (p->failure, 3); if ((unsigned) (row-p->top_margin) < p->height) { if ((unsigned) (col-p->left_margin) < p->width) { BAYER(row-p->top_margin,col-p->left_margin) = val; @@ -929,8 +931,6 @@ void DCR_CLASS dcr_lossless_jpeg_load_raw(DCRAW* p) } if (++col >= p->raw_width) col = (row++,0); - if (row >= p->raw_height) - longjmp (p->failure, 3); } } free (jh.row); |