Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix segfaults (double free & color conversion) in darktable-chart #13281

Merged
merged 3 commits into from Jan 5, 2023
Merged

Fix segfaults (double free & color conversion) in darktable-chart #13281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f19efbb
fix segfault (double free) in darktable-chart
m-p-y Jan 5, 2023
4ad1b93
adjust dt_Lab_to_XYZ arguments to type dt_aligned_pixel_t
m-p-y Jan 5, 2023
d7a873b
code clean up as proposed
m-p-y Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/chart/colorchart.c
View file
Open in desktop
Expand Up @@ -326,7 +326,6 @@ chart_t *parse_cht(const char *filename)
}

if(!first_label) first_label = label;
g_free(last_label);
last_label = label;

// store it
Expand Down Expand Up @@ -367,7 +366,6 @@ chart_t *parse_cht(const char *filename)
if(kl == 'X' || kl == 'Y')
g_hash_table_insert(result->patch_sets, g_strdup_printf("%s .. %s", first_label, last_label), labels);

g_free(last_label);
free(y_label);
free(x_label);
}
Expand Down
11 changes: 9 additions & 2 deletions src/chart/main.c
View file
Open in desktop
Expand Up @@ -1658,8 +1658,15 @@ static void image_lab_to_xyz(float *image, const int width, const int height)
for(int y = 0; y < height; y++)
for(int x = 0; x < width; x++)
{
float *pixel = &image[(x + y * width) * 3];
dt_Lab_to_XYZ(pixel, pixel);
const int i0 = (x + y * width) * 3 + 0;
const int i1 = (x + y * width) * 3 + 1;
const int i2 = (x + y * width) * 3 + 2;
dt_aligned_pixel_t pixel_lab = { image[i0], image[i1], image[i2] };
dt_aligned_pixel_t pixel_xyz = { 0.0 };
dt_Lab_to_XYZ(pixel_lab, pixel_xyz);
image[i0] = pixel_xyz[0];
image[i1] = pixel_xyz[1];
image[i2] = pixel_xyz[2];
}
}

Expand Down