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

Ensure bmalloc always takes positive size #49

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Ensure bmalloc always takes positive size #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d60208a
Avoid accessing null file pointer
norihiro Oct 19, 2024
9a4d680
Ensure bmalloc always takes positive size
norihiro Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/obs-text-pthread-thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ static void tp_stroke_path(cairo_t *cr, PangoLayout *layout, const struct tp_con
cairo_surface_t *surface = cairo_get_target(cr);
const int w = cairo_image_surface_get_width(surface);
const int h = cairo_image_surface_get_height(surface);
if (w <= 0 || h <= 0)
return;
uint8_t *data = cairo_image_surface_get_data(surface);
const int bs1 = bs + 1;
uint32_t *tmp = bzalloc(sizeof(uint32_t) * w * bs1);
Expand Down Expand Up @@ -237,6 +239,12 @@ static struct tp_texture *tp_draw_texture(struct tp_config *config, char *text)
uint32_t surface_height = config->height + outline_width_blur * 2 + shadow_abs_y;

int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, surface_width);

if (!surface_width || !surface_height || stride <= 0) {
blog(LOG_ERROR, "nothing to draw: %ux%u stride=%d", surface_width, surface_height, stride);
return n;
}

n->surface = bzalloc(stride * surface_height);

cairo_surface_t *surface = cairo_image_surface_create_for_data(n->surface, CAIRO_FORMAT_ARGB32, surface_width,
Expand Down Expand Up @@ -418,7 +426,8 @@ static FILE *fopen_png_list(uint64_t ns, const struct tp_config *config)
sprintf(fname, "%s/list-%08ds%03d.dat", config->save_file_dir, (int)(ms / 1000), (int)(ms % 1000));
FILE *fp = fopen(fname, "w");
bfree(fname);
png_list_write_config(fp, config, NULL);
if (fp)
png_list_write_config(fp, config, NULL);
return fp;
}

Expand Down Expand Up @@ -600,7 +609,7 @@ static void *tp_thread_main(void *data)
if (b_printable) {
tex = tp_draw_texture(&config_prev, text);
#ifdef PNG_FOUND
if (config_prev.save_file) {
if (config_prev.save_file && tex->width > 0 && tex->height > 0) {
png_width = tex->width;
png_height = tex->height;
png_surface = bzalloc(4 * png_width * png_height);
Expand Down
Loading