Commit: 9876d1f299541752ceb8c685c7fe962e9151e1c2
Author: Antony Riakiotakis
Date: Fri May 29 15:43:21 2015 +0200
Branches: master
https://developer.blender.org/rB9876d1f299541752ceb8c685c7fe962e9151e1c2
Yet another attempt to fix T44869
Fix some integer overflow cases in colormanagement code
===================================================================
M source/blender/imbuf/intern/colormanagement.c
===================================================================
diff --git a/source/blender/imbuf/intern/colormanagement.c
b/source/blender/imbuf/intern/colormanagement.c
index a2f89ec..c3c403d 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -1602,7 +1602,7 @@ static void processor_transform_init_handle(void
*handle_v, int start_line, int
int width = init_data->width;
bool predivide = init_data->predivide;
- int offset = channels * start_line * width;
+ size_t offset = ((size_t)channels) * start_line * width;
memset(handle, 0, sizeof(ProcessorTransformThread));
@@ -1990,7 +1990,7 @@ void IMB_colormanagement_buffer_make_display_space(float
*buffer, unsigned char
const
ColorManagedDisplaySettings *display_settings)
{
ColormanageProcessor *cm_processor;
- size_t float_buffer_size = width * height * channels * sizeof(float);
+ size_t float_buffer_size = ((size_t)width) * height * channels *
sizeof(float);
float *display_buffer_float = MEM_mallocN(float_buffer_size,
"byte_buffer_make_display_space");
memcpy(display_buffer_float, buffer, float_buffer_size);
@@ -2083,7 +2083,7 @@ unsigned char *IMB_display_buffer_acquire(ImBuf *ibuf,
const ColorManagedViewSet
return display_buffer;
}
- buffer_size = DISPLAY_BUFFER_CHANNELS * ibuf->x * ibuf->y *
sizeof(char);
+ buffer_size = DISPLAY_BUFFER_CHANNELS * ((size_t)ibuf->x) * ibuf->y *
sizeof(char);
display_buffer = MEM_callocN(buffer_size, "imbuf display buffer");
colormanage_display_buffer_process(ibuf, display_buffer,
applied_view_settings, display_settings);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
