blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix set_pixel overflow in fill brush 

The value of the index was above the size of image
This commit is contained in:
Antonio Vazquez 2018-07-31 17:02:50 +02:00
parent 4684375bd4
commit 9b817bc168
Notes: blender-bot 2023-02-14 07:08:27 +01:00 
Referenced by issue #56181, Creating grease pencil data block removes proportionnal editing UI buttons.
Referenced by issue #56182, Grease Pencil default interaction overrides Left click mouse select
Referenced by issue #56185, Changing color of material of grease pencil crashes blender 2.8
Referenced by issue #55747, [Crash] Typing ^ character
Referenced by issue #50961, Pressure sensitivity no longer works for HUION graphics tablet with resent Linux kernel
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/gpencil/gpencil_fill.c
View File

@ -372,6 +372,7 @@ static void get_pixel(ImBuf *ibuf, int idx, float r_col[4])
/* set pixel data (rgba) at index */
static void set_pixel(ImBuf *ibuf, int idx, const float col[4])
{
//BLI_assert(idx <= ibuf->x * ibuf->y);
if (ibuf->rect) {
uint *rrect = &ibuf->rect[idx];
uchar ccol[4];
@ -587,20 +588,23 @@ static void gpencil_clean_borders(tGPDfill *tgpf)
const float fill_col[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
ibuf = BKE_image_acquire_ibuf(tgpf->ima, NULL, &lock);
int idx;
int pixel = 0;
/* horizontal lines */
for (idx = 0; idx < ibuf->x; idx++) {
for (idx = 0; idx < ibuf->x - 1; idx++) {
/* bottom line */
set_pixel(ibuf, idx, fill_col);
/* top line */
set_pixel(ibuf, idx + (ibuf->x * (ibuf->y - 1)), fill_col);
pixel = idx + (ibuf->x * (ibuf->y - 1));
set_pixel(ibuf, pixel, fill_col);
}
/* vertical lines */
for (idx = 0; idx < ibuf->y; idx++) {
/* left line */
set_pixel(ibuf, ibuf->x * idx, fill_col);
/* right line */
set_pixel(ibuf, ibuf->x * idx + (ibuf->x - 1), fill_col);
pixel = ibuf->x * idx + (ibuf->x - 1);
set_pixel(ibuf, pixel, fill_col);
}
/* release ibuf */