Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:ALP:Workbench:1.0
tiff
tiff-CVE-2023-0795,CVE-2023-0796,CVE-2023-0797,...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File tiff-CVE-2023-0795,CVE-2023-0796,CVE-2023-0797,CVE-2023-0798,CVE-2023-0799.patch of Package tiff
Index: tiff-4.5.0/tools/tiffcrop.c =================================================================== --- tiff-4.5.0.orig/tools/tiffcrop.c +++ tiff-4.5.0/tools/tiffcrop.c @@ -296,7 +296,6 @@ struct region uint32_t width; /* width in pixels */ uint32_t length; /* length in pixels */ uint32_t buffsize; /* size of buffer needed to hold the cropped region */ - unsigned char *buffptr; /* address of start of the region */ }; /* Cropping parameters from command line and image data @@ -577,7 +576,7 @@ static int rotateContigSamples24bits(uin static int rotateContigSamples32bits(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, uint32_t, uint8_t *, uint8_t *); static int rotateImage(uint16_t, struct image_data *, uint32_t *, uint32_t *, - unsigned char **); + unsigned char **, size_t *, int); static int mirrorImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, unsigned char *); static int invertImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, @@ -5779,7 +5778,6 @@ static void initCropMasks(struct crop_ma cps->regionlist[i].width = 0; cps->regionlist[i].length = 0; cps->regionlist[i].buffsize = 0; - cps->regionlist[i].buffptr = NULL; cps->zonelist[i].position = 0; cps->zonelist[i].total = 0; } @@ -7241,9 +7239,13 @@ static int correct_orientation(struct im (uint16_t)(image->adjustments & ROTATE_ANY)); return (-1); } - - if (rotateImage(rotation, image, &image->width, &image->length, - work_buff_ptr)) + /* Dummy variable in order not to switch two times the + * image->width,->length within rotateImage(), + * but switch xres, yres there. */ + uint32_t width = image->width; + uint32_t length = image->length; + if (rotateImage(rotation, image, &width, &length, work_buff_ptr, NULL, + TRUE)) { TIFFError("correct_orientation", "Unable to rotate image"); return (-1); @@ -7312,7 +7314,6 @@ static int extractCompositeRegions(struc /* These should not be needed for composite images */ crop->regionlist[i].width = crop_width; crop->regionlist[i].length = crop_length; - crop->regionlist[i].buffptr = crop_buff; src_rowsize = ((img_width * bps * spp) + 7) / 8; dst_rowsize = (((crop_width * bps * count) + 7) / 8); @@ -7573,7 +7574,6 @@ static int extractSeparateRegion(struct crop->regionlist[region].width = crop_width; crop->regionlist[region].length = crop_length; - crop->regionlist[region].buffptr = crop_buff; src = read_buff; dst = crop_buff; @@ -8563,8 +8563,13 @@ static int processCropSelections(struct if (crop->crop_mode & CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */ { + /* rotateImage() set up a new buffer and calculates its size + * individually. Therefore, seg_buffs size needs to be updated + * accordingly. */ + size_t rot_buf_size = 0; if (rotateImage(crop->rotation, image, &crop->combined_width, - &crop->combined_length, &crop_buff)) + &crop->combined_length, &crop_buff, &rot_buf_size, + FALSE)) { TIFFError("processCropSelections", "Failed to rotate composite regions by %" PRIu32 @@ -8573,9 +8578,7 @@ static int processCropSelections(struct return (-1); } seg_buffs[0].buffer = crop_buff; - seg_buffs[0].size = - (((crop->combined_width * image->bps + 7) / 8) * image->spp) * - crop->combined_length; + seg_buffs[0].size = rot_buf_size; } } else /* Separated Images */ @@ -8686,10 +8689,14 @@ static int processCropSelections(struct * ->yres, what it schouldn't do here, when more than one * section is processed. ToDo: Therefore rotateImage() and its * usage has to be reworked (e.g. like mirrorImage()) !! - */ + * Furthermore, rotateImage() set up a new buffer and calculates + * its size individually. Therefore, seg_buffs size needs to be + * updated accordingly. */ + size_t rot_buf_size = 0; if (rotateImage(crop->rotation, image, &crop->regionlist[i].width, - &crop->regionlist[i].length, &crop_buff)) + &crop->regionlist[i].length, &crop_buff, + &rot_buf_size, FALSE)) { TIFFError("processCropSelections", "Failed to rotate crop region by %" PRIu16 @@ -8702,10 +8709,7 @@ static int processCropSelections(struct crop->combined_width = total_width; crop->combined_length = total_length; seg_buffs[i].buffer = crop_buff; - seg_buffs[i].size = - (((crop->regionlist[i].width * image->bps + 7) / 8) * - image->spp) * - crop->regionlist[i].length; + seg_buffs[i].size = rot_buf_size; } } /* for crop->selections loop */ } /* Separated Images (else case) */ @@ -8836,7 +8840,7 @@ static int createCroppedImage(struct ima CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */ { if (rotateImage(crop->rotation, image, &crop->combined_width, - &crop->combined_length, crop_buff_ptr)) + &crop->combined_length, crop_buff_ptr, NULL, TRUE)) { TIFFError("createCroppedImage", "Failed to rotate image or cropped selection by %" PRIu16 @@ -9552,7 +9556,8 @@ static int rotateContigSamples32bits(uin /* Rotate an image by a multiple of 90 degrees clockwise */ static int rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width, uint32_t *img_length, - unsigned char **ibuff_ptr) + unsigned char **ibuff_ptr, size_t *rot_buf_size, + int rot_image_params) { int shift_width; uint32_t bytes_per_pixel, bytes_per_sample; @@ -9610,6 +9615,8 @@ static int rotateImage(uint16_t rotation return (-1); } _TIFFmemset(rbuff, '\0', buffsize + NUM_BUFF_OVERSIZE_BYTES); + if (rot_buf_size != NULL) + *rot_buf_size = buffsize; ibuff = *ibuff_ptr; switch (rotation) @@ -9768,11 +9775,15 @@ static int rotateImage(uint16_t rotation *img_width = length; *img_length = width; - image->width = length; - image->length = width; - res_temp = image->xres; - image->xres = image->yres; - image->yres = res_temp; + /* Only toggle image parameters if whole input image is rotated. */ + if (rot_image_params) + { + image->width = length; + image->length = width; + res_temp = image->xres; + image->xres = image->yres; + image->yres = res_temp; + } break; case 270: @@ -9855,11 +9866,15 @@ static int rotateImage(uint16_t rotation *img_width = length; *img_length = width; - image->width = length; - image->length = width; - res_temp = image->xres; - image->xres = image->yres; - image->yres = res_temp; + /* Only toggle image parameters if whole input image is rotated. */ + if (rot_image_params) + { + image->width = length; + image->length = width; + res_temp = image->xres; + image->xres = image->yres; + image->yres = res_temp; + } break; default: break;
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
