Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE
libraw.8044
libraw-SA79000.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File libraw-SA79000.patch of Package libraw.8044
Index: LibRaw-0.17.1/internal/dcraw_common.cpp =================================================================== --- LibRaw-0.17.1.orig/internal/dcraw_common.cpp 2018-03-12 10:13:25.188282653 +0100 +++ LibRaw-0.17.1/internal/dcraw_common.cpp 2018-03-12 10:57:09.229274092 +0100 @@ -1225,6 +1225,10 @@ void CLASS nikon_load_raw() void CLASS nikon_yuv_load_raw() { +#ifdef LIBRAW_LIBRARY_BUILD + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif int row, col, yuv[4], rgb[3], b, c; UINT64 bitbuf=0; @@ -2012,6 +2016,10 @@ void CLASS sinar_4shot_load_raw() unpacked_load_raw(); return; } +#ifdef LIBRAW_LIBRARY_BUILD + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif pixel = (ushort *) calloc (raw_width, sizeof *pixel); merror (pixel, "sinar_4shot_load_raw()"); #ifdef LIBRAW_LIBRARY_BUILD @@ -2469,6 +2477,11 @@ void CLASS quicktake_100_load_raw() void CLASS kodak_radc_load_raw() { +#ifdef LIBRAW_LIBRARY_BUILD + // All kodak radc images are 768x512 + if(width>768 || raw_width>768 || height > 512 || raw_height>512 ) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif static const signed char src[] = { 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, @@ -2720,6 +2733,10 @@ void CLASS gamma_curve (double pwr, doub void CLASS lossy_dng_load_raw() { +#ifdef LIBRAW_LIBRARY_BUILD + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif struct jpeg_decompress_struct cinfo; struct jpeg_error_mgr jerr; JSAMPARRAY buf; @@ -2851,6 +2868,10 @@ void CLASS eight_bit_load_raw() void CLASS kodak_c330_load_raw() { +#ifdef LIBRAW_LIBRARY_BUILD + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif uchar *pixel; int row, col, y, cb, cr, rgb[3], c; @@ -2888,6 +2909,10 @@ void CLASS kodak_c330_load_raw() void CLASS kodak_c603_load_raw() { +#ifdef LIBRAW_LIBRARY_BUILD + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif uchar *pixel; int row, col, y, cb, cr, rgb[3], c; @@ -3051,11 +3076,14 @@ void CLASS kodak_65000_load_raw() void CLASS kodak_ycbcr_load_raw() { +#ifdef LIBRAW_LIBRARY_BUILD + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif short buf[384], *bp; int row, col, len, c, i, j, k, y[2][2], cb, cr, rgb[3]; ushort *ip; - if (!image) return; unsigned int bits = (load_flags && load_flags > 9 && load_flags < 17)?load_flags:10; for (row=0; row < height; row+=2) { @@ -3085,6 +3113,10 @@ void CLASS kodak_ycbcr_load_raw() void CLASS kodak_rgb_load_raw() { +#ifdef LIBRAW_LIBRARY_BUILD + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif short buf[768], *bp; int row, col, len, c, i, rgb[3],ret; ushort *ip=image[0]; @@ -3113,6 +3145,10 @@ void CLASS kodak_rgb_load_raw() void CLASS kodak_thumb_load_raw() { +#ifdef LIBRAW_LIBRARY_BUILD + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; +#endif int row, col; colors = thumb_misc >> 5; for (row=0; row < height; row++) Index: LibRaw-0.17.1/src/libraw_cxx.cpp =================================================================== --- LibRaw-0.17.1.orig/src/libraw_cxx.cpp 2018-03-12 10:13:25.200282864 +0100 +++ LibRaw-0.17.1/src/libraw_cxx.cpp 2018-03-12 10:18:03.681009673 +0100 @@ -1472,7 +1472,7 @@ int LibRaw::unpack(void) S.raw_pitch = S.width*8; // allocate image as temporary buffer, size imgdata.rawdata.raw_alloc = 0; - imgdata.image = (ushort (*)[4]) calloc(S.iwidth*S.iheight,sizeof(*imgdata.image)); + imgdata.image = (ushort(*)[4])calloc(unsigned(MAX(S.width,S.raw_width)) * unsigned(MAX(S.height,S.raw_height)), sizeof(*imgdata.image)); imgdata.rawdata.raw_image = (ushort*) imgdata.image ; zero_rawimage = 1; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor